diff --git a/libcelt/bands.c b/libcelt/bands.c index 87055d81..98c79336 100644 --- a/libcelt/bands.c +++ b/libcelt/bands.c @@ -36,10 +36,10 @@ const int qbank[NBANDS+2] = {0, 2, 4, 6, 8, 12, 16, 20, 24, 28, 36, 44, 52, 68, 84, 116, 128}; -const int qpulses[NBANDS ] = {7, 5, 4, 4, 3, 3, 3, 3, 3, 4, 4, 4, 0, 0, 0}; +const int qpulses[NBANDS ] = {7, 5, 4, 4, 3, 3, 3, 4, 4, 4, -2, -1, -1, -1, 0}; //const int qpulses[NBANDS ] = {17,15,14,14,13, 13, 13, 13, 13, 14, 14, 14, 10, 10, 10}; -#define WAVEFORM_END 52 +#define WAVEFORM_END 36 /* Start frequency of each band */ int pbank[] = {0, 4, 8, 12, 20, WAVEFORM_END, 128}; @@ -147,24 +147,28 @@ void quant_bands(float *X, int B, float *P) { int i, j; float norm[B*qbank[NBANDS+1]]; + //float bits = 0; for (i=0;i0) { float n = sqrt(B*(qbank[i+1]-qbank[i])); alg_quant2(X+B*qbank[i], B*(qbank[i+1]-qbank[i]), q, P+B*qbank[i]); for (j=B*qbank[i];j.9999) - Rpp = .9999; Rxx = 0; for (j=B*qbank[i];j4) + pred_gain = .5; + else + pred_gain = pg[K]; + E = 1e-10; + for (j=0;j