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

Ignoring lower bands in folding_decision()

Browse source
This commit is contained in:
Jean-Marc Valin 2010-08-31 17:08:45 -04:00
parent 1213ba5e68
commit 020ef4f810
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libcelt/bands.c
View file

@ -248,7 +248,7 @@ static void stereo_band_mix(const CELTMode *m, celt_norm *X, celt_norm *Y, const
int folding_decision(const CELTMode *m, celt_norm *X, int *average, int *last_decision, int end, int _C, int M) int folding_decision(const CELTMode *m, celt_norm *X, int *average, int *last_decision, int end, int _C, int M)
{ {
int i, c, N0; int i, c, N0;
int sum = 0; int sum = 0, nbBands=0;
const int C = CHANNELS(_C); const int C = CHANNELS(_C);
const celt_int16 * restrict eBands = m->eBands; const celt_int16 * restrict eBands = m->eBands;
int decision; int decision;
@ -262,7 +262,9 @@ int folding_decision(const CELTMode *m, celt_norm *X, int *average, int *last_de
int j, N, tmp=0; int j, N, tmp=0;
int tcount[3] = {0}; int tcount[3] = {0};
celt_norm * restrict x = X+M*eBands[i]+c*N0; celt_norm * restrict x = X+M*eBands[i]+c*N0;
N = M*eBands[i+1]-M*eBands[i]; N = M*(eBands[i+1]-eBands[i]);
if (N<=8)
continue;
/* Compute rough CDF of |x[j]| */ /* Compute rough CDF of |x[j]| */
for (j=0;j<N;j++) for (j=0;j<N;j++)
{ {
@ -279,9 +281,10 @@ int folding_decision(const CELTMode *m, celt_norm *X, int *average, int *last_de
tmp = (2*tcount[2] >= N) + (2*tcount[1] >= N) + (2*tcount[0] >= N); tmp = (2*tcount[2] >= N) + (2*tcount[1] >= N) + (2*tcount[0] >= N);
sum += tmp*256; sum += tmp*256;
nbBands++;
} }
} }
sum /= C*end; sum /= nbBands;
/* Recursive averaging */ /* Recursive averaging */
sum = (sum+*average)>>1; sum = (sum+*average)>>1;
*average = sum; *average = sum;