-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
- (C) 2008-2009 Gregory Maxwell */
+/* Copyright (c) 2007-2008 CSIRO
+ Copyright (c) 2007-2009 Xiph.Org Foundation
+ Copyright (c) 2008-2009 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
#include "mathops.h"
#include "rate.h"
-const celt_word16_t sqrtC_1[2] = {QCONST16(1.f, 14), QCONST16(1.414214f, 14)};
#ifdef FIXED_POINT
/* Compute the amplitude (sqrt energy) in each of the bands */
-void compute_band_energies(const CELTMode *m, const celt_sig_t *X, celt_ener_t *bank)
+void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bank, int _C, int M)
{
int i, c, N;
- const celt_int16_t *eBands = m->eBands;
- const int C = CHANNELS(m);
+ const celt_int16 *eBands = m->eBands;
+ const int C = CHANNELS(_C);
N = FRAMESIZE(m);
for (c=0;c<C;c++)
{
for (i=0;i<m->nbEBands;i++)
{
int j;
- celt_word32_t maxval=0;
- celt_word32_t sum = 0;
+ celt_word32 maxval=0;
+ celt_word32 sum = 0;
- j=eBands[i]; do {
+ j=M*eBands[i]; do {
maxval = MAX32(maxval, X[j+c*N]);
maxval = MAX32(maxval, -X[j+c*N]);
- } while (++j<eBands[i+1]);
+ } while (++j<M*eBands[i+1]);
if (maxval > 0)
{
int shift = celt_ilog2(maxval)-10;
- j=eBands[i]; do {
+ j=M*eBands[i]; do {
sum = MAC16_16(sum, EXTRACT16(VSHR32(X[j+c*N],shift)),
EXTRACT16(VSHR32(X[j+c*N],shift)));
- } while (++j<eBands[i+1]);
+ } while (++j<M*eBands[i+1]);
/* We're adding one here to make damn sure we never end up with a pitch vector that's
larger than unity norm */
bank[i+c*m->nbEBands] = EPSILON+VSHR32(EXTEND32(celt_sqrt(sum)),-shift);
}
/* Normalise each band such that the energy is one. */
-void normalise_bands(const CELTMode *m, const celt_sig_t * restrict freq, celt_norm_t * restrict X, const celt_ener_t *bank)
+void normalise_bands(const CELTMode *m, const celt_sig * restrict freq, celt_norm * restrict X, const celt_ener *bank, int _C, int M)
{
int i, c, N;
- const celt_int16_t *eBands = m->eBands;
- const int C = CHANNELS(m);
+ const celt_int16 *eBands = m->eBands;
+ const int C = CHANNELS(_C);
N = FRAMESIZE(m);
for (c=0;c<C;c++)
{
i=0; do {
- celt_word16_t g;
+ celt_word16 g;
int j,shift;
- celt_word16_t E;
+ celt_word16 E;
shift = celt_zlog2(bank[i+c*m->nbEBands])-13;
E = VSHR32(bank[i+c*m->nbEBands], shift);
g = EXTRACT16(celt_rcp(SHL32(E,3)));
- j=eBands[i]; do {
- X[j*C+c] = MULT16_16_Q15(VSHR32(freq[j+c*N],shift-1),g);
- } while (++j<eBands[i+1]);
+ j=M*eBands[i]; do {
+ X[j+c*N] = MULT16_16_Q15(VSHR32(freq[j+c*N],shift-1),g);
+ } while (++j<M*eBands[i+1]);
} while (++i<m->nbEBands);
}
}
#else /* FIXED_POINT */
/* Compute the amplitude (sqrt energy) in each of the bands */
-void compute_band_energies(const CELTMode *m, const celt_sig_t *X, celt_ener_t *bank)
+void compute_band_energies(const CELTMode *m, const celt_sig *X, celt_ener *bank, int _C, int M)
{
int i, c, N;
- const celt_int16_t *eBands = m->eBands;
- const int C = CHANNELS(m);
+ const celt_int16 *eBands = m->eBands;
+ const int C = CHANNELS(_C);
N = FRAMESIZE(m);
for (c=0;c<C;c++)
{
for (i=0;i<m->nbEBands;i++)
{
int j;
- celt_word32_t sum = 1e-10;
- for (j=eBands[i];j<eBands[i+1];j++)
+ celt_word32 sum = 1e-10;
+ for (j=M*eBands[i];j<M*eBands[i+1];j++)
sum += X[j+c*N]*X[j+c*N];
bank[i+c*m->nbEBands] = sqrt(sum);
/*printf ("%f ", bank[i+c*m->nbEBands]);*/
}
#ifdef EXP_PSY
-void compute_noise_energies(const CELTMode *m, const celt_sig_t *X, const celt_word16_t *tonality, celt_ener_t *bank)
+void compute_noise_energies(const CELTMode *m, const celt_sig *X, const celt_word16 *tonality, celt_ener *bank, int _C, int M)
{
int i, c, N;
- const celt_int16_t *eBands = m->eBands;
- const int C = CHANNELS(m);
+ const celt_int16 *eBands = m->eBands;
+ const int C = CHANNELS(_C);
N = FRAMESIZE(m);
for (c=0;c<C;c++)
{
for (i=0;i<m->nbEBands;i++)
{
int j;
- celt_word32_t sum = 1e-10;
- for (j=eBands[i];j<eBands[i+1];j++)
+ celt_word32 sum = 1e-10;
+ for (j=M*eBands[i];j<M*eBands[i+1];j++)
sum += X[j*C+c]*X[j+c*N]*tonality[j];
bank[i+c*m->nbEBands] = sqrt(sum);
/*printf ("%f ", bank[i+c*m->nbEBands]);*/
#endif
/* Normalise each band such that the energy is one. */
-void normalise_bands(const CELTMode *m, const celt_sig_t * restrict freq, celt_norm_t * restrict X, const celt_ener_t *bank)
+void normalise_bands(const CELTMode *m, const celt_sig * restrict freq, celt_norm * restrict X, const celt_ener *bank, int _C, int M)
{
int i, c, N;
- const celt_int16_t *eBands = m->eBands;
- const int C = CHANNELS(m);
+ const celt_int16 *eBands = m->eBands;
+ const int C = CHANNELS(_C);
N = FRAMESIZE(m);
for (c=0;c<C;c++)
{
for (i=0;i<m->nbEBands;i++)
{
int j;
- celt_word16_t g = 1.f/(1e-10+bank[i+c*m->nbEBands]);
- for (j=eBands[i];j<eBands[i+1];j++)
- X[j*C+c] = freq[j+c*N]*g;
+ celt_word16 g = 1.f/(1e-10f+bank[i+c*m->nbEBands]);
+ for (j=M*eBands[i];j<M*eBands[i+1];j++)
+ X[j+c*N] = freq[j+c*N]*g;
}
}
}
#endif /* FIXED_POINT */
-#ifndef DISABLE_STEREO
-void renormalise_bands(const CELTMode *m, celt_norm_t * restrict X)
+void renormalise_bands(const CELTMode *m, celt_norm * restrict X, int _C, int M)
{
int i, c;
- const celt_int16_t *eBands = m->eBands;
- const int C = CHANNELS(m);
+ const celt_int16 *eBands = m->eBands;
+ const int C = CHANNELS(_C);
for (c=0;c<C;c++)
{
i=0; do {
- renormalise_vector(X+C*eBands[i]+c, QCONST16(0.70711f, 15), eBands[i+1]-eBands[i], C);
+ renormalise_vector(X+M*eBands[i]+c*M*eBands[m->nbEBands+1], Q15ONE, M*eBands[i+1]-M*eBands[i], 1);
} while (++i<m->nbEBands);
}
}
-#endif /* DISABLE_STEREO */
/* De-normalise the energy to produce the synthesis from the unit-energy bands */
-void denormalise_bands(const CELTMode *m, const celt_norm_t * restrict X, celt_sig_t * restrict freq, const celt_ener_t *bank)
+void denormalise_bands(const CELTMode *m, const celt_norm * restrict X, celt_sig * restrict freq, const celt_ener *bank, int _C, int M)
{
int i, c, N;
- const celt_int16_t *eBands = m->eBands;
- const int C = CHANNELS(m);
+ const celt_int16 *eBands = m->eBands;
+ const int C = CHANNELS(_C);
N = FRAMESIZE(m);
if (C>2)
celt_fatal("denormalise_bands() not implemented for >2 channels");
for (c=0;c<C;c++)
{
+ celt_sig * restrict f;
+ const celt_norm * restrict x;
+ f = freq+c*N;
+ x = X+c*N;
for (i=0;i<m->nbEBands;i++)
{
- int j;
- celt_word32_t g = SHR32(bank[i+c*m->nbEBands],1);
- j=eBands[i]; do {
- freq[j+c*N] = SHL32(MULT16_32_Q15(X[j*C+c], g),2);
- } while (++j<eBands[i+1]);
+ int j, end;
+ celt_word32 g = SHR32(bank[i+c*m->nbEBands],1);
+ j=M*eBands[i];
+ end = M*eBands[i+1];
+ do {
+ *f++ = SHL32(MULT16_32_Q15(*x, g),2);
+ x++;
+ } while (++j<end);
}
- for (i=eBands[m->nbEBands];i<eBands[m->nbEBands+1];i++)
- freq[i+c*N] = 0;
+ for (i=M*eBands[m->nbEBands];i<M*eBands[m->nbEBands+1];i++)
+ *f++ = 0;
}
}
+int compute_pitch_gain(const CELTMode *m, const celt_sig *X, const celt_sig *P, int norm_rate, int *gain_id, int _C, celt_word16 *gain_prod)
+{
+ int j, c;
+ celt_word16 g;
+ celt_word16 delta;
+ const int C = CHANNELS(_C);
+ celt_word32 Sxy=0, Sxx=0, Syy=0;
+ int len = m->pitchEnd;
+ const int N = FRAMESIZE(m);
+#ifdef FIXED_POINT
+ int shift = 0;
+ celt_word32 maxabs=0;
+
+ for (c=0;c<C;c++)
+ {
+ for (j=0;j<len;j++)
+ {
+ maxabs = MAX32(maxabs, ABS32(X[j+c*N]));
+ maxabs = MAX32(maxabs, ABS32(P[j+c*N]));
+ }
+ }
+ shift = celt_ilog2(maxabs)-12;
+ if (shift<0)
+ shift = 0;
+#endif
+ delta = PDIV32_16(Q15ONE, len);
+ for (c=0;c<C;c++)
+ {
+ celt_word16 gg = Q15ONE;
+ for (j=0;j<len;j++)
+ {
+ celt_word16 Xj, Pj;
+ Xj = EXTRACT16(SHR32(X[j+c*N], shift));
+ Pj = MULT16_16_P15(gg,EXTRACT16(SHR32(P[j+c*N], shift)));
+ Sxy = MAC16_16(Sxy, Xj, Pj);
+ Sxx = MAC16_16(Sxx, Pj, Pj);
+ Syy = MAC16_16(Syy, Xj, Xj);
+ gg = SUB16(gg, delta);
+ }
+ }
+#ifdef FIXED_POINT
+ {
+ celt_word32 num, den;
+ celt_word16 fact;
+ fact = MULT16_16(QCONST16(.04f, 14), norm_rate);
+ if (fact < QCONST16(1.f, 14))
+ fact = QCONST16(1.f, 14);
+ num = Sxy;
+ den = EPSILON+Sxx+MULT16_32_Q15(QCONST16(.03f,15),Syy);
+ shift = celt_zlog2(Sxy)-16;
+ if (shift < 0)
+ shift = 0;
+ if (Sxy < MULT16_32_Q15(fact, MULT16_16(celt_sqrt(EPSILON+Sxx),celt_sqrt(EPSILON+Syy))))
+ g = 0;
+ else
+ g = DIV32(SHL32(SHR32(num,shift),14),ADD32(EPSILON,SHR32(den,shift)));
+
+ /* This MUST round down so that we don't over-estimate the gain */
+ *gain_id = EXTRACT16(SHR32(MULT16_16(20,(g-QCONST16(.5f,14))),14));
+ }
+#else
+ {
+ float fact = .04f*norm_rate;
+ if (fact < 1)
+ fact = 1;
+ g = Sxy/(.1f+Sxx+.03f*Syy);
+ if (Sxy < .5f*fact*celt_sqrt(1+Sxx*Syy))
+ g = 0;
+ /* This MUST round down so that we don't over-estimate the gain */
+ *gain_id = floor(20*(g-.5f));
+ }
+#endif
+ /* This prevents the pitch gain from being above 1.0 for too long by bounding the
+ maximum error amplification factor to 2.0 */
+ g = ADD16(QCONST16(.5f,14), MULT16_16_16(QCONST16(.05f,14),*gain_id));
+ *gain_prod = MAX16(QCONST32(1.f, 13), MULT16_16_Q14(*gain_prod,g));
+ if (*gain_prod>QCONST32(2.f, 13))
+ {
+ *gain_id=9;
+ *gain_prod = QCONST32(2.f, 13);
+ }
+
+ if (*gain_id < 0)
+ {
+ *gain_id = 0;
+ return 0;
+ } else {
+ if (*gain_id > 15)
+ *gain_id = 15;
+ return 1;
+ }
+}
-/* Compute the best gain for each "pitch band" */
-int compute_pitch_gain(const CELTMode *m, const celt_norm_t *X, const celt_norm_t *P, celt_pgain_t *gains)
+void apply_pitch(const CELTMode *m, celt_sig *X, const celt_sig *P, int gain_id, int pred, int _C)
{
- int i;
- int gain_sum = 0;
- const celt_int16_t *pBands = m->pBands;
- const int C = CHANNELS(m);
+ int j, c, N;
+ celt_word16 gain;
+ celt_word16 delta;
+ const int C = CHANNELS(_C);
+ int len = m->pitchEnd;
- for (i=0;i<m->nbPBands;i++)
+ N = FRAMESIZE(m);
+ gain = ADD16(QCONST16(.5f,14), MULT16_16_16(QCONST16(.05f,14),gain_id));
+ delta = PDIV32_16(gain, len);
+ if (pred)
+ gain = -gain;
+ else
+ delta = -delta;
+ for (c=0;c<C;c++)
{
- celt_word32_t Sxy=0, Sxx=0;
- int j;
- /* We know we're not going to overflow because Sxx can't be more than 1 (Q28) */
- for (j=C*pBands[i];j<C*pBands[i+1];j++)
+ celt_word16 gg = gain;
+ for (j=0;j<len;j++)
{
- Sxy = MAC16_16(Sxy, X[j], P[j]);
- Sxx = MAC16_16(Sxx, X[j], X[j]);
+ X[j+c*N] += SHL32(MULT16_32_Q15(gg,P[j+c*N]),1);
+ gg = ADD16(gg, delta);
}
- Sxy = SHR32(Sxy,2);
- Sxx = SHR32(Sxx,2);
- /* No negative gain allowed */
- if (Sxy < 0)
- Sxy = 0;
- /* Not sure how that would happen, just making sure */
- if (Sxy > Sxx)
- Sxy = Sxx;
- /* We need to be a bit conservative (multiply gain by 0.9), otherwise the
- residual doesn't quantise well */
- Sxy = MULT16_32_Q15(QCONST16(.99f, 15), Sxy);
- /* gain = Sxy/Sxx */
- gains[i] = EXTRACT16(celt_div(Sxy,ADD32(SHR32(Sxx, PGAIN_SHIFT),EPSILON)));
- if (gains[i]>QCONST16(.5,15))
- gain_sum++;
}
- return gain_sum > 5;
}
#ifndef DISABLE_STEREO
-static void stereo_band_mix(const CELTMode *m, celt_norm_t *X, const celt_ener_t *bank, int stereo_mode, int bandID, int dir)
+static void stereo_band_mix(const CELTMode *m, celt_norm *X, celt_norm *Y, const celt_ener *bank, int stereo_mode, int bandID, int dir, int M)
{
int i = bandID;
- const celt_int16_t *eBands = m->eBands;
- const int C = CHANNELS(m);
+ const celt_int16 *eBands = m->eBands;
int j;
- celt_word16_t a1, a2;
+ celt_word16 a1, a2;
if (stereo_mode==0)
{
/* Do mid-side when not doing intensity stereo */
a1 = QCONST16(.70711f,14);
a2 = dir*QCONST16(.70711f,14);
} else {
- celt_word16_t left, right;
- celt_word16_t norm;
+ celt_word16 left, right;
+ celt_word16 norm;
#ifdef FIXED_POINT
int shift = celt_zlog2(MAX32(bank[i], bank[i+m->nbEBands]))-13;
#endif
a1 = DIV32_16(SHL32(EXTEND32(left),14),norm);
a2 = dir*DIV32_16(SHL32(EXTEND32(right),14),norm);
}
- for (j=eBands[i];j<eBands[i+1];j++)
+ for (j=0;j<M*eBands[i+1]-M*eBands[i];j++)
{
- celt_norm_t r, l;
- l = X[j*C];
- r = X[j*C+1];
- X[j*C] = MULT16_16_Q14(a1,l) + MULT16_16_Q14(a2,r);
- X[j*C+1] = MULT16_16_Q14(a1,r) - MULT16_16_Q14(a2,l);
+ celt_norm r, l;
+ l = X[j];
+ r = Y[j];
+ X[j] = MULT16_16_Q14(a1,l) + MULT16_16_Q14(a2,r);
+ Y[j] = MULT16_16_Q14(a1,r) - MULT16_16_Q14(a2,l);
}
}
-void interleave(celt_norm_t *x, int N)
-{
- int i;
- VARDECL(celt_norm_t, tmp);
- SAVE_STACK;
- ALLOC(tmp, N, celt_norm_t);
-
- for (i=0;i<N;i++)
- tmp[i] = x[i];
- for (i=0;i<N>>1;i++)
- {
- x[i<<1] = tmp[i];
- x[(i<<1)+1] = tmp[i+(N>>1)];
- }
- RESTORE_STACK;
-}
-
-void deinterleave(celt_norm_t *x, int N)
-{
- int i;
- VARDECL(celt_norm_t, tmp);
- SAVE_STACK;
- ALLOC(tmp, N, celt_norm_t);
-
- for (i=0;i<N;i++)
- tmp[i] = x[i];
- for (i=0;i<N>>1;i++)
- {
- x[i] = tmp[i<<1];
- x[i+(N>>1)] = tmp[(i<<1)+1];
- }
- RESTORE_STACK;
-}
-
#endif /* DISABLE_STEREO */
-int folding_decision(const CELTMode *m, celt_norm_t *X, celt_word16_t *average, int *last_decision)
+int folding_decision(const CELTMode *m, celt_norm *X, celt_word16 *average, int *last_decision, int _C, int M)
{
- int i;
+ int i, c, N0;
int NR=0;
- celt_word32_t ratio = EPSILON;
- const celt_int16_t * restrict eBands = m->eBands;
+ celt_word32 ratio = EPSILON;
+ const int C = CHANNELS(_C);
+ const celt_int16 * restrict eBands = m->eBands;
+
+ N0 = FRAMESIZE(m);
+
+ for (c=0;c<C;c++)
+ {
for (i=0;i<m->nbEBands;i++)
{
int j, N;
int max_i=0;
- celt_word16_t max_val=EPSILON;
- celt_word32_t floor_ener=EPSILON;
- celt_norm_t * restrict x = X+eBands[i];
- N = eBands[i+1]-eBands[i];
+ celt_word16 max_val=EPSILON;
+ celt_word32 floor_ener=EPSILON;
+ celt_norm * restrict x = X+M*eBands[i]+c*N0;
+ N = M*eBands[i+1]-M*eBands[i];
for (j=0;j<N;j++)
{
if (ABS16(x[j])>max_val)
#else
floor_ener = QCONST32(1.,28)-MULT16_16(max_val,max_val);
if (max_i < N-1)
- floor_ener -= MULT16_16(x[max_i+1], x[max_i+1]);
+ floor_ener -= MULT16_16(x[(max_i+1)], x[(max_i+1)]);
if (max_i < N-2)
- floor_ener -= MULT16_16(x[max_i+2], x[max_i+2]);
+ floor_ener -= MULT16_16(x[(max_i+2)], x[(max_i+2)]);
if (max_i > 0)
- floor_ener -= MULT16_16(x[max_i-1], x[max_i-1]);
+ floor_ener -= MULT16_16(x[(max_i-1)], x[(max_i-1)]);
if (max_i > 1)
- floor_ener -= MULT16_16(x[max_i-2], x[max_i-2]);
+ floor_ener -= MULT16_16(x[(max_i-2)], x[(max_i-2)]);
floor_ener = MAX32(floor_ener, EPSILON);
#endif
- if (N>7 && eBands[i] >= m->pitchEnd)
+ if (N>7)
{
- celt_word16_t r;
- celt_word16_t den = celt_sqrt(floor_ener);
- den = MAX32(QCONST16(.02, 15), den);
+ celt_word16 r;
+ celt_word16 den = celt_sqrt(floor_ener);
+ den = MAX32(QCONST16(.02f, 15), den);
r = DIV32_16(SHL32(EXTEND32(max_val),8),den);
ratio = ADD32(ratio, EXTEND32(r));
NR++;
}
}
+ }
if (NR>0)
ratio = DIV32_16(ratio, NR);
ratio = ADD32(HALF32(ratio), HALF32(*average));
if (!*last_decision)
{
- *last_decision = (ratio < QCONST16(1.8,8));
+ *last_decision = (ratio < QCONST16(1.8f,8));
} else {
- *last_decision = (ratio < QCONST16(3.,8));
+ *last_decision = (ratio < QCONST16(3.f,8));
}
*average = EXTRACT16(ratio);
return *last_decision;
}
/* Quantisation of the residual */
-void quant_bands(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t *P, celt_mask_t *W, int pitch_used, celt_pgain_t *pgains, const celt_ener_t *bandE, int *pulses, int shortBlocks, int fold, int total_bits, ec_enc *enc)
+void quant_bands(const CELTMode *m, int start, celt_norm * restrict X, const celt_ener *bandE, int *pulses, int shortBlocks, int fold, int resynth, int total_bits, int encode, void *enc_dec, int M)
{
int i, j, remaining_bits, balance;
- const celt_int16_t * restrict eBands = m->eBands;
- celt_norm_t * restrict norm;
- VARDECL(celt_norm_t, _norm); const celt_int16_t *pBands = m->pBands;
- int pband=-1;
+ const celt_int16 * restrict eBands = m->eBands;
+ celt_norm * restrict norm;
+ VARDECL(celt_norm, _norm);
int B;
SAVE_STACK;
B = shortBlocks ? m->nbShortMdcts : 1;
- ALLOC(_norm, eBands[m->nbEBands+1], celt_norm_t);
+ ALLOC(_norm, M*eBands[m->nbEBands+1], celt_norm);
norm = _norm;
balance = 0;
- for (i=0;i<m->nbEBands;i++)
+ for (i=start;i<m->nbEBands;i++)
{
int tell;
int N;
int q;
- celt_word16_t n;
- const celt_int16_t * const *BPbits;
+ const celt_int16 * const *BPbits;
int curr_balance, curr_bits;
- N = eBands[i+1]-eBands[i];
+ N = M*eBands[i+1]-M*eBands[i];
BPbits = m->bits;
- tell = ec_enc_tell(enc, 4);
- if (i != 0)
+ if (encode)
+ tell = ec_enc_tell(enc_dec, BITRES);
+ else
+ tell = ec_dec_tell(enc_dec, BITRES);
+ if (i != start)
balance -= tell;
remaining_bits = (total_bits<<BITRES)-tell-1;
curr_balance = (m->nbEBands-i);
}
balance += pulses[i] + tell;
- n = SHL16(celt_sqrt(eBands[i+1]-eBands[i]),11);
- /* If pitch is in use and this eBand begins a pitch band, encode the pitch gain flag */
- if (pitch_used && eBands[i]< m->pitchEnd && eBands[i] == pBands[pband+1])
+ if (q > 0)
{
- int enabled = 1;
- pband++;
- if (remaining_bits >= 1<<BITRES) {
- enabled = pgains[pband] > QCONST16(.5,15);
- ec_enc_bits(enc, enabled, 1);
- balance += 1<<BITRES;
- }
- if (enabled)
- pgains[pband] = QCONST16(.9,15);
+ int spread = fold ? B : 0;
+ if (encode)
+ alg_quant(X+M*eBands[i], N, q, spread, resynth, enc_dec);
else
- pgains[pband] = 0;
- }
-
- /* If pitch isn't available, use intra-frame prediction */
- if ((eBands[i] >= m->pitchEnd && fold) || q<=0)
- {
- intra_fold(m, X+eBands[i], eBands[i+1]-eBands[i], &q, norm, P+eBands[i], eBands[i], B);
- } else if (pitch_used && eBands[i] < m->pitchEnd) {
- for (j=eBands[i];j<eBands[i+1];j++)
- P[j] = MULT16_16_Q15(pgains[pband], P[j]);
+ alg_unquant(X+M*eBands[i], N, q, spread, enc_dec);
} else {
- for (j=eBands[i];j<eBands[i+1];j++)
- P[j] = 0;
+ if (resynth)
+ intra_fold(m, start, N, norm, X+M*eBands[i], M*eBands[i], B, M);
}
-
- if (q > 0)
+ if (resynth)
{
- alg_quant(X+eBands[i], W+eBands[i], eBands[i+1]-eBands[i], q, P+eBands[i], enc);
- } else {
- for (j=eBands[i];j<eBands[i+1];j++)
- X[j] = P[j];
+ celt_word16 n;
+ n = celt_sqrt(SHL32(EXTEND32(N),22));
+ for (j=M*eBands[i];j<M*eBands[i+1];j++)
+ norm[j] = MULT16_16_Q15(n,X[j]);
}
- for (j=eBands[i];j<eBands[i+1];j++)
- norm[j] = MULT16_16_Q15(n,X[j]);
}
RESTORE_STACK;
}
#ifndef DISABLE_STEREO
-void quant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t *P, celt_mask_t *W, int pitch_used, celt_pgain_t *pgains, const celt_ener_t *bandE, int *pulses, int shortBlocks, int fold, int total_bits, ec_enc *enc)
+void quant_bands_stereo(const CELTMode *m, int start, celt_norm *_X, const celt_ener *bandE, int *pulses, int shortBlocks, int fold, int resynth, int total_bits, ec_enc *enc, int M)
{
int i, j, remaining_bits, balance;
- const celt_int16_t * restrict eBands = m->eBands;
- celt_norm_t * restrict norm;
- VARDECL(celt_norm_t, _norm);
- const int C = CHANNELS(m);
- const celt_int16_t *pBands = m->pBands;
- int pband=-1;
+ const celt_int16 * restrict eBands = m->eBands;
+ celt_norm * restrict norm;
+ VARDECL(celt_norm, _norm);
int B;
- celt_word16_t mid, side;
+ celt_word16 mid, side;
SAVE_STACK;
B = shortBlocks ? m->nbShortMdcts : 1;
- ALLOC(_norm, C*eBands[m->nbEBands+1], celt_norm_t);
+ ALLOC(_norm, M*eBands[m->nbEBands+1], celt_norm);
norm = _norm;
balance = 0;
- for (i=0;i<m->nbEBands;i++)
+ for (i=start;i<m->nbEBands;i++)
{
- int c;
int tell;
int q1, q2;
- celt_word16_t n;
- const celt_int16_t * const *BPbits;
+ const celt_int16 * const *BPbits;
int b, qb;
int N;
int curr_balance, curr_bits;
int imid, iside, itheta;
int mbits, sbits, delta;
int qalloc;
+ celt_norm * restrict X, * restrict Y;
+ X = _X+M*eBands[i];
+ Y = X+M*eBands[m->nbEBands+1];
BPbits = m->bits;
- N = eBands[i+1]-eBands[i];
- tell = ec_enc_tell(enc, 4);
- if (i != 0)
+ N = M*eBands[i+1]-M*eBands[i];
+ tell = ec_enc_tell(enc, BITRES);
+ if (i != start)
balance -= tell;
remaining_bits = (total_bits<<BITRES)-tell-1;
curr_balance = (m->nbEBands-i);
if (b<0)
b = 0;
- qb = (b-2*(N-1)*(40-log2_frac(N,4)))/(32*(N-1));
+ qb = (b-2*(N-1)*(QTHETA_OFFSET-log2_frac(N,BITRES)))/(32*(N-1));
if (qb > (b>>BITRES)-1)
qb = (b>>BITRES)-1;
if (qb<0)
if (qb>14)
qb = 14;
- stereo_band_mix(m, X, bandE, qb==0, i, 1);
+ stereo_band_mix(m, X, Y, bandE, qb==0, i, 1, M);
- mid = renormalise_vector(X+C*eBands[i], Q15ONE, N, C);
- side = renormalise_vector(X+C*eBands[i]+1, Q15ONE, N, C);
+ mid = renormalise_vector(X, Q15ONE, N, 1);
+ side = renormalise_vector(Y, Q15ONE, N, 1);
#ifdef FIXED_POINT
- itheta = MULT16_16_Q15(QCONST16(0.63662,15),celt_atan2p(side, mid));
+ itheta = MULT16_16_Q15(QCONST16(0.63662f,15),celt_atan2p(side, mid));
#else
- itheta = floor(.5+16384*0.63662*atan2(side,mid));
+ itheta = floor(.5f+16384*0.63662f*atan2(side,mid));
#endif
- qalloc = log2_frac((1<<qb)+1,4);
+ qalloc = log2_frac((1<<qb)+1,BITRES);
if (qb==0)
{
itheta=0;
} else {
imid = bitexact_cos(itheta);
iside = bitexact_cos(16384-itheta);
- delta = (N-1)*(log2_frac(iside,6)-log2_frac(imid,6))>>2;
+ delta = (N-1)*(log2_frac(iside,BITRES+2)-log2_frac(imid,BITRES+2))>>2;
}
- mbits = (b-qalloc/2-delta)/2;
- if (mbits > b-qalloc)
- mbits = b-qalloc;
- if (mbits<0)
- mbits=0;
- sbits = b-qalloc-mbits;
- q1 = bits2pulses(m, BPbits[i], N, mbits);
- q2 = bits2pulses(m, BPbits[i], N, sbits);
- curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
- remaining_bits -= curr_bits;
- while (remaining_bits < 0 && (q1 > 0 || q2 > 0))
+#if 1
+ if (N==2)
{
- remaining_bits += curr_bits;
- if (q1>q2)
+ int c, c2;
+ int sign=1;
+ celt_norm v[2], w[2];
+ celt_norm *x2, *y2;
+ mbits = b-qalloc;
+ sbits = 0;
+ if (itheta != 0 && itheta != 16384)
+ sbits = 1<<BITRES;
+ mbits -= sbits;
+ c = itheta > 8192 ? 1 : 0;
+ c2 = 1-c;
+
+ x2 = X;
+ y2 = Y;
+ if (c==0)
{
- q1--;
- curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
+ v[0] = x2[0];
+ v[1] = x2[1];
+ w[0] = y2[0];
+ w[1] = y2[1];
} else {
- q2--;
- curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
+ v[0] = y2[0];
+ v[1] = y2[1];
+ w[0] = x2[0];
+ w[1] = x2[1];
}
+ q1 = bits2pulses(m, BPbits[i], N, mbits);
+ curr_bits = pulses2bits(BPbits[i], N, q1)+qalloc+sbits;
remaining_bits -= curr_bits;
- }
- balance += pulses[i] + tell;
-
- n = SHL16(celt_sqrt((eBands[i+1]-eBands[i])),11);
+ while (remaining_bits < 0 && q1 > 0)
+ {
+ remaining_bits += curr_bits;
+ q1--;
+ curr_bits = pulses2bits(BPbits[i], N, q1)+qalloc;
+ remaining_bits -= curr_bits;
+ }
- /* If pitch is in use and this eBand begins a pitch band, encode the pitch gain flag */
- if (pitch_used && eBands[i]< m->pitchEnd && eBands[i] == pBands[pband+1])
+ if (q1 > 0)
+ {
+ int spread = fold ? B : 0;
+ alg_quant(v, N, q1, spread, resynth, enc);
+ } else {
+ v[0] = QCONST16(1.f, 14);
+ v[1] = 0;
+ }
+ if (sbits)
+ {
+ if (v[0]*w[1] - v[1]*w[0] > 0)
+ sign = 1;
+ else
+ sign = -1;
+ ec_enc_bits(enc, sign==1, 1);
+ } else {
+ sign = 1;
+ }
+ w[0] = -sign*v[1];
+ w[1] = sign*v[0];
+ if (c==0)
+ {
+ x2[0] = v[0];
+ x2[1] = v[1];
+ y2[0] = w[0];
+ y2[1] = w[1];
+ } else {
+ x2[0] = w[0];
+ x2[1] = w[1];
+ y2[0] = v[0];
+ y2[1] = v[1];
+ }
+ } else
+#endif
{
- int enabled = 1;
- pband++;
- if (remaining_bits >= 1<<BITRES) {
- enabled = pgains[pband] > QCONST16(.5,15);
- ec_enc_bits(enc, enabled, 1);
- balance += 1<<BITRES;
+
+ mbits = (b-qalloc/2-delta)/2;
+ if (mbits > b-qalloc)
+ mbits = b-qalloc;
+ if (mbits<0)
+ mbits=0;
+ sbits = b-qalloc-mbits;
+ q1 = bits2pulses(m, BPbits[i], N, mbits);
+ q2 = bits2pulses(m, BPbits[i], N, sbits);
+ curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
+ remaining_bits -= curr_bits;
+ while (remaining_bits < 0 && (q1 > 0 || q2 > 0))
+ {
+ remaining_bits += curr_bits;
+ if (q1>q2)
+ {
+ q1--;
+ curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
+ } else {
+ q2--;
+ curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
+ }
+ remaining_bits -= curr_bits;
}
- if (enabled)
- pgains[pband] = QCONST16(.9,15);
- else
- pgains[pband] = 0;
+
+ if (q1 > 0) {
+ int spread = fold ? B : 0;
+ alg_quant(X, N, q1, spread, resynth, enc);
+ } else {
+ if (resynth)
+ intra_fold(m, start, N, norm, X, M*eBands[i], B, M);
+ }
+ if (q2 > 0) {
+ int spread = fold ? B : 0;
+ alg_quant(Y, N, q2, spread, resynth, enc);
+ } else
+ for (j=0;j<N;j++)
+ Y[j] = 0;
}
+ balance += pulses[i] + tell;
- /* If pitch isn't available, use intra-frame prediction */
- if ((eBands[i] >= m->pitchEnd && fold) || (q1+q2)<=0)
+ if (resynth)
{
- int K[2] = {q1, q2};
- intra_fold(m, X+C*eBands[i], eBands[i+1]-eBands[i], K, norm, P+C*eBands[i], eBands[i], B);
- deinterleave(P+C*eBands[i], C*N);
- } else if (pitch_used && eBands[i] < m->pitchEnd) {
- stereo_band_mix(m, P, bandE, qb==0, i, 1);
- renormalise_vector(P+C*eBands[i], Q15ONE, N, C);
- renormalise_vector(P+C*eBands[i]+1, Q15ONE, N, C);
- deinterleave(P+C*eBands[i], C*N);
- for (j=C*eBands[i];j<C*eBands[i+1];j++)
- P[j] = MULT16_16_Q15(pgains[pband], P[j]);
- } else {
- for (j=C*eBands[i];j<C*eBands[i+1];j++)
- P[j] = 0;
- }
- deinterleave(X+C*eBands[i], C*N);
- if (q1 > 0)
- alg_quant(X+C*eBands[i], W+C*eBands[i], N, q1, P+C*eBands[i], enc);
- else
- for (j=C*eBands[i];j<C*eBands[i]+N;j++)
- X[j] = P[j];
- if (q2 > 0)
- alg_quant(X+C*eBands[i]+N, W+C*eBands[i], N, q2, P+C*eBands[i]+N, enc);
- else
- for (j=C*eBands[i]+N;j<C*eBands[i+1];j++)
- X[j] = 0;
-
+ celt_word16 n;
#ifdef FIXED_POINT
- mid = imid;
- side = iside;
+ mid = imid;
+ side = iside;
#else
- mid = (1./32768)*imid;
- side = (1./32768)*iside;
+ mid = (1.f/32768)*imid;
+ side = (1.f/32768)*iside;
#endif
- for (c=0;c<C;c++)
+ n = celt_sqrt(SHL32(EXTEND32(N),22));
for (j=0;j<N;j++)
- norm[C*(eBands[i]+j)+c] = MULT16_16_Q15(n,X[C*eBands[i]+c*N+j]);
-
- for (j=0;j<N;j++)
- X[C*eBands[i]+j] = MULT16_16_Q15(X[C*eBands[i]+j], mid);
- for (j=0;j<N;j++)
- X[C*eBands[i]+N+j] = MULT16_16_Q15(X[C*eBands[i]+N+j], side);
-
- interleave(X+C*eBands[i], C*N);
+ norm[M*eBands[i]+j] = MULT16_16_Q15(n,X[j]);
+ for (j=0;j<N;j++)
+ X[j] = MULT16_16_Q15(X[j], mid);
+ for (j=0;j<N;j++)
+ Y[j] = MULT16_16_Q15(Y[j], side);
- stereo_band_mix(m, X, bandE, 0, i, -1);
- renormalise_vector(X+C*eBands[i], Q15ONE, N, C);
- renormalise_vector(X+C*eBands[i]+1, Q15ONE, N, C);
+ stereo_band_mix(m, X, Y, bandE, 0, i, -1, M);
+ renormalise_vector(X, Q15ONE, N, 1);
+ renormalise_vector(Y, Q15ONE, N, 1);
+ }
}
RESTORE_STACK;
}
#endif /* DISABLE_STEREO */
-/* Decoding of the residual */
-void unquant_bands(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t *P, int pitch_used, celt_pgain_t *pgains, const celt_ener_t *bandE, int *pulses, int shortBlocks, int fold, int total_bits, ec_dec *dec)
-{
- int i, j, remaining_bits, balance;
- const celt_int16_t * restrict eBands = m->eBands;
- celt_norm_t * restrict norm;
- VARDECL(celt_norm_t, _norm);
- const celt_int16_t *pBands = m->pBands;
- int pband=-1;
- int B;
- SAVE_STACK;
-
- B = shortBlocks ? m->nbShortMdcts : 1;
- ALLOC(_norm, eBands[m->nbEBands+1], celt_norm_t);
- norm = _norm;
-
- balance = 0;
- for (i=0;i<m->nbEBands;i++)
- {
- int tell;
- int N;
- int q;
- celt_word16_t n;
- const celt_int16_t * const *BPbits;
-
- int curr_balance, curr_bits;
-
- N = eBands[i+1]-eBands[i];
- BPbits = m->bits;
-
- tell = ec_dec_tell(dec, 4);
- if (i != 0)
- balance -= tell;
- remaining_bits = (total_bits<<BITRES)-tell-1;
- curr_balance = (m->nbEBands-i);
- if (curr_balance > 3)
- curr_balance = 3;
- curr_balance = balance / curr_balance;
- q = bits2pulses(m, BPbits[i], N, pulses[i]+curr_balance);
- curr_bits = pulses2bits(BPbits[i], N, q);
- remaining_bits -= curr_bits;
- while (remaining_bits < 0 && q > 0)
- {
- remaining_bits += curr_bits;
- q--;
- curr_bits = pulses2bits(BPbits[i], N, q);
- remaining_bits -= curr_bits;
- }
- balance += pulses[i] + tell;
-
- n = SHL16(celt_sqrt(eBands[i+1]-eBands[i]),11);
-
- /* If pitch is in use and this eBand begins a pitch band, encode the pitch gain flag */
- if (pitch_used && eBands[i] < m->pitchEnd && eBands[i] == pBands[pband+1])
- {
- int enabled = 1;
- pband++;
- if (remaining_bits >= 1<<BITRES) {
- enabled = ec_dec_bits(dec, 1);
- balance += 1<<BITRES;
- }
- if (enabled)
- pgains[pband] = QCONST16(.9,15);
- else
- pgains[pband] = 0;
- }
-
- /* If pitch isn't available, use intra-frame prediction */
- if ((eBands[i] >= m->pitchEnd && fold) || q<=0)
- {
- intra_fold(m, X+eBands[i], eBands[i+1]-eBands[i], &q, norm, P+eBands[i], eBands[i], B);
- } else if (pitch_used && eBands[i] < m->pitchEnd) {
- for (j=eBands[i];j<eBands[i+1];j++)
- P[j] = MULT16_16_Q15(pgains[pband], P[j]);
- } else {
- for (j=eBands[i];j<eBands[i+1];j++)
- P[j] = 0;
- }
-
- if (q > 0)
- {
- alg_unquant(X+eBands[i], eBands[i+1]-eBands[i], q, P+eBands[i], dec);
- } else {
- for (j=eBands[i];j<eBands[i+1];j++)
- X[j] = P[j];
- }
- for (j=eBands[i];j<eBands[i+1];j++)
- norm[j] = MULT16_16_Q15(n,X[j]);
- }
- RESTORE_STACK;
-}
#ifndef DISABLE_STEREO
-void unquant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t *P, int pitch_used, celt_pgain_t *pgains, const celt_ener_t *bandE, int *pulses, int shortBlocks, int fold, int total_bits, ec_dec *dec)
+void unquant_bands_stereo(const CELTMode *m, int start, celt_norm *_X, const celt_ener *bandE, int *pulses, int shortBlocks, int fold, int total_bits, ec_dec *dec, int M)
{
int i, j, remaining_bits, balance;
- const celt_int16_t * restrict eBands = m->eBands;
- celt_norm_t * restrict norm;
- VARDECL(celt_norm_t, _norm);
- const int C = CHANNELS(m);
- const celt_int16_t *pBands = m->pBands;
- int pband=-1;
+ const celt_int16 * restrict eBands = m->eBands;
+ celt_norm * restrict norm;
+ VARDECL(celt_norm, _norm);
int B;
- celt_word16_t mid, side;
+ celt_word16 mid, side;
SAVE_STACK;
B = shortBlocks ? m->nbShortMdcts : 1;
- ALLOC(_norm, C*eBands[m->nbEBands+1], celt_norm_t);
+ ALLOC(_norm, M*eBands[m->nbEBands+1], celt_norm);
norm = _norm;
balance = 0;
- for (i=0;i<m->nbEBands;i++)
+ for (i=start;i<m->nbEBands;i++)
{
- int c;
int tell;
int q1, q2;
- celt_word16_t n;
- const celt_int16_t * const *BPbits;
+ celt_word16 n;
+ const celt_int16 * const *BPbits;
int b, qb;
int N;
int curr_balance, curr_bits;
int imid, iside, itheta;
int mbits, sbits, delta;
int qalloc;
+ celt_norm * restrict X, * restrict Y;
+ X = _X+M*eBands[i];
+ Y = X+M*eBands[m->nbEBands+1];
BPbits = m->bits;
- N = eBands[i+1]-eBands[i];
- tell = ec_dec_tell(dec, 4);
- if (i != 0)
+ N = M*eBands[i+1]-M*eBands[i];
+ tell = ec_dec_tell(dec, BITRES);
+ if (i != start)
balance -= tell;
remaining_bits = (total_bits<<BITRES)-tell-1;
curr_balance = (m->nbEBands-i);
if (b<0)
b = 0;
- qb = (b-2*(N-1)*(40-log2_frac(N,4)))/(32*(N-1));
+ qb = (b-2*(N-1)*(QTHETA_OFFSET-log2_frac(N,BITRES)))/(32*(N-1));
if (qb > (b>>BITRES)-1)
qb = (b>>BITRES)-1;
if (qb>14)
qb = 14;
if (qb<0)
qb = 0;
- qalloc = log2_frac((1<<qb)+1,4);
+ qalloc = log2_frac((1<<qb)+1,BITRES);
if (qb==0)
{
itheta=0;
} else {
imid = bitexact_cos(itheta);
iside = bitexact_cos(16384-itheta);
- delta = (N-1)*(log2_frac(iside,6)-log2_frac(imid,6))>>2;
+ delta = (N-1)*(log2_frac(iside,BITRES+2)-log2_frac(imid,BITRES+2))>>2;
}
- mbits = (b-qalloc/2-delta)/2;
- if (mbits > b-qalloc)
- mbits = b-qalloc;
- if (mbits<0)
- mbits=0;
- sbits = b-qalloc-mbits;
- q1 = bits2pulses(m, BPbits[i], N, mbits);
- q2 = bits2pulses(m, BPbits[i], N, sbits);
- curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
- remaining_bits -= curr_bits;
- while (remaining_bits < 0 && (q1 > 0 || q2 > 0))
+ n = celt_sqrt(SHL32(EXTEND32(N),22));
+
+#if 1
+ if (N==2)
{
- remaining_bits += curr_bits;
- if (q1>q2)
+ int c, c2;
+ int sign=1;
+ celt_norm v[2], w[2];
+ celt_norm *x2, *y2;
+ mbits = b-qalloc;
+ sbits = 0;
+ if (itheta != 0 && itheta != 16384)
+ sbits = 1<<BITRES;
+ mbits -= sbits;
+ c = itheta > 8192 ? 1 : 0;
+ c2 = 1-c;
+
+ x2 = X;
+ y2 = Y;
+ v[0] = x2[c];
+ v[1] = y2[c];
+ w[0] = x2[c2];
+ w[1] = y2[c2];
+ q1 = bits2pulses(m, BPbits[i], N, mbits);
+ curr_bits = pulses2bits(BPbits[i], N, q1)+qalloc+sbits;
+ remaining_bits -= curr_bits;
+ while (remaining_bits < 0 && q1 > 0)
{
+ remaining_bits += curr_bits;
q1--;
- curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
- } else {
- q2--;
- curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
+ curr_bits = pulses2bits(BPbits[i], N, q1)+qalloc;
+ remaining_bits -= curr_bits;
}
- remaining_bits -= curr_bits;
- }
- balance += pulses[i] + tell;
-
- n = SHL16(celt_sqrt((eBands[i+1]-eBands[i])),11);
- /* If pitch is in use and this eBand begins a pitch band, encode the pitch gain flag */
- if (pitch_used && eBands[i]< m->pitchEnd && eBands[i] == pBands[pband+1])
- {
- int enabled = 1;
- pband++;
- if (remaining_bits >= 1<<BITRES) {
- enabled = ec_dec_bits(dec, 1);
- balance += 1<<BITRES;
+ if (q1 > 0)
+ {
+ int spread = fold ? B : 0;
+ alg_unquant(v, N, q1, spread, dec);
+ } else {
+ v[0] = QCONST16(1.f, 14);
+ v[1] = 0;
}
- if (enabled)
- pgains[pband] = QCONST16(.9,15);
+ if (sbits)
+ sign = 2*ec_dec_bits(dec, 1)-1;
else
- pgains[pband] = 0;
- }
-
- /* If pitch isn't available, use intra-frame prediction */
- if ((eBands[i] >= m->pitchEnd && fold) || (q1+q2)<=0)
+ sign = 1;
+ w[0] = -sign*v[1];
+ w[1] = sign*v[0];
+ if (c==0)
+ {
+ x2[0] = v[0];
+ x2[1] = v[1];
+ y2[0] = w[0];
+ y2[1] = w[1];
+ } else {
+ x2[0] = w[0];
+ x2[1] = w[1];
+ y2[0] = v[0];
+ y2[1] = v[1];
+ }
+ } else
+#endif
{
- int K[2] = {q1, q2};
- intra_fold(m, X+C*eBands[i], eBands[i+1]-eBands[i], K, norm, P+C*eBands[i], eBands[i], B);
- deinterleave(P+C*eBands[i], C*N);
- } else if (pitch_used && eBands[i] < m->pitchEnd) {
- stereo_band_mix(m, P, bandE, qb==0, i, 1);
- renormalise_vector(P+C*eBands[i], Q15ONE, N, C);
- renormalise_vector(P+C*eBands[i]+1, Q15ONE, N, C);
- deinterleave(P+C*eBands[i], C*N);
- for (j=C*eBands[i];j<C*eBands[i+1];j++)
- P[j] = MULT16_16_Q15(pgains[pband], P[j]);
- } else {
- for (j=C*eBands[i];j<C*eBands[i+1];j++)
- P[j] = 0;
+ mbits = (b-qalloc/2-delta)/2;
+ if (mbits > b-qalloc)
+ mbits = b-qalloc;
+ if (mbits<0)
+ mbits=0;
+ sbits = b-qalloc-mbits;
+ q1 = bits2pulses(m, BPbits[i], N, mbits);
+ q2 = bits2pulses(m, BPbits[i], N, sbits);
+ curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
+ remaining_bits -= curr_bits;
+ while (remaining_bits < 0 && (q1 > 0 || q2 > 0))
+ {
+ remaining_bits += curr_bits;
+ if (q1>q2)
+ {
+ q1--;
+ curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
+ } else {
+ q2--;
+ curr_bits = pulses2bits(BPbits[i], N, q1)+pulses2bits(BPbits[i], N, q2)+qalloc;
+ }
+ remaining_bits -= curr_bits;
+ }
+
+ if (q1 > 0)
+ {
+ int spread = fold ? B : 0;
+ alg_unquant(X, N, q1, spread, dec);
+ } else
+ intra_fold(m, start, N, norm, X, M*eBands[i], B, M);
+ if (q2 > 0)
+ {
+ int spread = fold ? B : 0;
+ alg_unquant(Y, N, q2, spread, dec);
+ } else
+ for (j=0;j<N;j++)
+ Y[j] = 0;
+ /*orthogonalize(X+C*M*eBands[i], X+C*M*eBands[i]+N, N);*/
}
- deinterleave(X+C*eBands[i], C*N);
- if (q1 > 0)
- alg_unquant(X+C*eBands[i], N, q1, P+C*eBands[i], dec);
- else
- for (j=C*eBands[i];j<C*eBands[i]+N;j++)
- X[j] = P[j];
- if (q2 > 0)
- alg_unquant(X+C*eBands[i]+N, N, q2, P+C*eBands[i]+N, dec);
- else
- for (j=C*eBands[i]+N;j<C*eBands[i+1];j++)
- X[j] = 0;
- /*orthogonalize(X+C*eBands[i], X+C*eBands[i]+N, N);*/
+ balance += pulses[i] + tell;
#ifdef FIXED_POINT
mid = imid;
side = iside;
#else
- mid = (1./32768)*imid;
- side = (1./32768)*iside;
+ mid = (1.f/32768)*imid;
+ side = (1.f/32768)*iside;
#endif
- for (c=0;c<C;c++)
- for (j=0;j<N;j++)
- norm[C*(eBands[i]+j)+c] = MULT16_16_Q15(n,X[C*eBands[i]+c*N+j]);
+ for (j=0;j<N;j++)
+ norm[M*eBands[i]+j] = MULT16_16_Q15(n,X[j]);
for (j=0;j<N;j++)
- X[C*eBands[i]+j] = MULT16_16_Q15(X[C*eBands[i]+j], mid);
+ X[j] = MULT16_16_Q15(X[j], mid);
for (j=0;j<N;j++)
- X[C*eBands[i]+N+j] = MULT16_16_Q15(X[C*eBands[i]+N+j], side);
-
- interleave(X+C*eBands[i], C*N);
+ Y[j] = MULT16_16_Q15(Y[j], side);
- stereo_band_mix(m, X, bandE, 0, i, -1);
- renormalise_vector(X+C*eBands[i], Q15ONE, N, C);
- renormalise_vector(X+C*eBands[i]+1, Q15ONE, N, C);
+ stereo_band_mix(m, X, Y, bandE, 0, i, -1, M);
+ renormalise_vector(X, Q15ONE, N, 1);
+ renormalise_vector(Y, Q15ONE, N, 1);
}
RESTORE_STACK;
}
xiph / opus.git / blobdiff