From 91f07dc125247a422c186edbebc05f54380b2dbf Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Date: Sat, 25 Jul 2009 20:42:24 -0400
Subject: [PATCH] Changing some code to use BITRES directly instead of its
 value.

---
 libcelt/bands.c | 20 ++++++++++----------
 libcelt/celt.c  |  2 +-
 libcelt/rate.c  |  2 +-
 libcelt/rate.h  |  4 +++-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/libcelt/bands.c b/libcelt/bands.c
index ff8ea5d8..c767b788 100644
--- a/libcelt/bands.c
+++ b/libcelt/bands.c
@@ -417,7 +417,7 @@ void quant_bands(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t *P, ce
       N = eBands[i+1]-eBands[i];
       BPbits = m->bits;
 
-      tell = ec_enc_tell(enc, 4);
+      tell = ec_enc_tell(enc, BITRES);
       if (i != 0)
          balance -= tell;
       remaining_bits = (total_bits<<BITRES)-tell-1;
@@ -517,7 +517,7 @@ void quant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t
       BPbits = m->bits;
 
       N = eBands[i+1]-eBands[i];
-      tell = ec_enc_tell(enc, 4);
+      tell = ec_enc_tell(enc, BITRES);
       if (i != 0)
          balance -= tell;
       remaining_bits = (total_bits<<BITRES)-tell-1;
@@ -529,7 +529,7 @@ void quant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t
       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)
@@ -546,7 +546,7 @@ void quant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t
 #else
       itheta = floor(.5+16384*0.63662*atan2(side,mid));
 #endif
-      qalloc = log2_frac((1<<qb)+1,4);
+      qalloc = log2_frac((1<<qb)+1,BITRES);
       if (qb==0)
       {
          itheta=0;
@@ -570,7 +570,7 @@ void quant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t
       } 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)
@@ -702,7 +702,7 @@ void unquant_bands(const CELTMode *m, celt_norm_t * restrict X, celt_norm_t *P,
       N = eBands[i+1]-eBands[i];
       BPbits = m->bits;
 
-      tell = ec_dec_tell(dec, 4);
+      tell = ec_dec_tell(dec, BITRES);
       if (i != 0)
          balance -= tell;
       remaining_bits = (total_bits<<BITRES)-tell-1;
@@ -801,7 +801,7 @@ void unquant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm
       BPbits = m->bits;
 
       N = eBands[i+1]-eBands[i];
-      tell = ec_dec_tell(dec, 4);
+      tell = ec_dec_tell(dec, BITRES);
       if (i != 0)
          balance -= tell;
       remaining_bits = (total_bits<<BITRES)-tell-1;
@@ -813,14 +813,14 @@ void unquant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm
       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;
@@ -843,7 +843,7 @@ void unquant_bands_stereo(const CELTMode *m, celt_norm_t * restrict X, celt_norm
       } 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)
diff --git a/libcelt/celt.c b/libcelt/celt.c
index eb2d50e1..fb86278b 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -828,7 +828,7 @@ int celt_encode_float(CELTEncoder * restrict st, const celt_sig_t * pcm, celt_si
 
      /* The average energy is removed from the target and the actual 
         energy added*/
-     target=target-588+ec_enc_tell(&enc, 4);
+     target=target-588+ec_enc_tell(&enc, BITRES);
 
      /* In VBR mode the frame size must not be reduced so much that it would result in the coarse energy busting its budget */
      target=IMAX(coarse_needed,(target+64)/128);
diff --git a/libcelt/rate.c b/libcelt/rate.c
index b3887017..c38391f2 100644
--- a/libcelt/rate.c
+++ b/libcelt/rate.c
@@ -146,7 +146,7 @@ static void interp_bits2pulses(const CELTMode *m, int *bits1, int *bits2, int to
 
       N=m->eBands[j+1]-m->eBands[j]; 
       d=C*N<<BITRES; 
-      offset = 50 - log2_frac(N, 4);
+      offset = FINE_OFFSET - log2_frac(N, BITRES);
       /* Offset for the number of fine bits compared to their "fair share" of total/N */
       offset = bits[j]-offset*N*C;
       if (offset < 0)
diff --git a/libcelt/rate.h b/libcelt/rate.h
index c5c4884c..93f90cef 100644
--- a/libcelt/rate.h
+++ b/libcelt/rate.h
@@ -39,7 +39,9 @@
 #define LOG_MAX_PULSES 7
 
 #define BITRES 4
-#define BITROUND 8
+#define FINE_OFFSET 50
+#define QTHETA_OFFSET 40
+
 #define BITOVERFLOW 30000
 
 #include "cwrs.h"