Fixed a stereo regression introduced in e28f25f0d1

This commit is contained in:
Jean-Marc Valin 2008-04-10 09:00:12 +10:00
parent 5a7d9b2c62
commit 15588ad667
2 changed files with 5 additions and 4 deletions

1
TODO
View file

@ -1,3 +1,4 @@
- Fix channel order in intra prediction and folding
- Dynamic adjustment of energy quantisation - Dynamic adjustment of energy quantisation
- Psychacoustics - Psychacoustics
* Error shaping within each band * Error shaping within each band

View file

@ -311,9 +311,9 @@ void intra_prediction(celt_norm_t *x, celt_mask_t *W, int N, int K, celt_norm_t
/*printf ("%d %d ", sign, best);*/ /*printf ("%d %d ", sign, best);*/
ec_enc_bits(enc,sign,1); ec_enc_bits(enc,sign,1);
if (max_pos == MAX_INTRA) if (max_pos == MAX_INTRA)
ec_enc_bits(enc,best,LOG_MAX_INTRA); ec_enc_bits(enc,best/B,LOG_MAX_INTRA);
else else
ec_enc_uint(enc,best,max_pos); ec_enc_uint(enc,best/B,max_pos);
/*printf ("%d %f\n", best, best_score);*/ /*printf ("%d %f\n", best, best_score);*/
@ -363,9 +363,9 @@ void intra_unquant(celt_norm_t *x, int N, int K, celt_norm_t *Y, celt_norm_t * r
s = -1; s = -1;
if (max_pos == MAX_INTRA) if (max_pos == MAX_INTRA)
best = ec_dec_bits(dec, LOG_MAX_INTRA); best = B*ec_dec_bits(dec, LOG_MAX_INTRA);
else else
best = ec_dec_uint(dec, max_pos); best = B*ec_dec_uint(dec, max_pos);
/*printf ("%d %d ", sign, best);*/ /*printf ("%d %d ", sign, best);*/
if (K>10) if (K>10)