improved energy quantisation/prediction

This commit is contained in:
Jean-Marc Valin 2007-12-06 13:50:14 +11:00
parent 06311335b5
commit aeb4467d7f
2 changed files with 7 additions and 6 deletions

View file

@ -163,14 +163,13 @@ void quant_bands(const CELTMode *m, float *X, float *P)
alg_quant2(X+B*eBands[i], B*(eBands[i+1]-eBands[i]), q, P+B*eBands[i]);
for (j=B*eBands[i];j<B*eBands[i+1];j++)
norm[j] = X[j] * n;
//bits += log2(ncwrs(B*(qbank[i+1]-qbank[i]), q));
//bits += log2(ncwrs(B*(eBands[i+1]-eBands[i]), q));
} else {
float n = sqrt(B*(eBands[i+1]-eBands[i]));
copy_quant(X+B*eBands[i], B*(eBands[i+1]-eBands[i]), -q, norm, B, eBands[i]);
for (j=B*eBands[i];j<B*eBands[i+1];j++)
norm[j] = X[j] * n;
//bits += 1+log2(qbank[i])+log2(ncwrs(B*(qbank[i+1]-qbank[i]), -q));
//noise_quant(X+B*qbank[i], B*(qbank[i+1]-qbank[i]), q, P+B*qbank[i]);
//bits += 1+log2(eBands[i])+log2(ncwrs(B*(eBands[i+1]-eBands[i]), -q));
}
}
//printf ("%f\n", bits);