commit b4dfce46658ca9847b3f7b93efeba37ebbcd0cf1
author Jean-Marc Valin <Jean-Marc.Valin@csiro.au> Mon Feb 25 17:41:30 2008 +1100
committer Jean-Marc Valin <Jean-Marc.Valin@csiro.au> Mon Feb 25 17:41:30 2008 +1100
tree df65fb350345cb5b65d9e8ec3557ca4bb07d69b6
parent 5c032a4cb4620d5a1dad7eadb5e3d90a962a5256

fixed-point: Using a NORM_SCALING of 16384, sig_norm_t is still a float though.

libcelt/vq.c

diff --git a/libcelt/vq.c b/libcelt/vq.c
index 057a536..3827d87 100644
--- a/libcelt/vq.c
+++ b/libcelt/vq.c
@@ -106,6 +106,12 @@
    ALLOC(_nbest, L, struct NBest);
    ALLOC(nbest, L, struct NBest *);
 
+   for (j=0;j<N;j++)
+   {
+      x[j] *= NORM_SCALING_1;
+      p[j] *= NORM_SCALING_1;
+   }
+   
    for (m=0;m<L;m++)
       nbest[m] = &_nbest[m];
    
@@ -301,6 +307,11 @@
          x[i] = p[i] + g*y[0][i];
       
    }
+   for (j=0;j<N;j++)
+   {
+      x[j] *= NORM_SCALING;
+      p[j] *= NORM_SCALING;
+   }
 
 }
 
@@ -318,6 +329,11 @@
    ALLOC(y, N, float);
 
    decode_pulses(iy, N, K, dec);
+   for (i=0;i<N;i++)
+   {
+      x[i] *= NORM_SCALING_1;
+      p[i] *= NORM_SCALING_1;
+   }
 
    /*for (i=0;i<N;i++)
       printf ("%d ", iy[i]);*/
@@ -342,6 +358,12 @@
 
    for (i=0;i<N;i++)
       x[i] = p[i] + g*y[i];
+   for (i=0;i<N;i++)
+   {
+      x[i] *= NORM_SCALING;
+      p[i] *= NORM_SCALING;
+   }
+
 }
 
 
@@ -367,8 +389,8 @@
       float score;
       for (j=0;j<N;j++)
       {
-         xy += x[j]*Y[i+N-j-1];
-         yy += Y[i+N-j-1]*Y[i+N-j-1];
+         xy += 1.f*x[j]*Y[i+N-j-1];
+         yy += 1.f*Y[i+N-j-1]*Y[i+N-j-1];
       }
       score = xy*xy/(.001+yy);
       if (score > best_score)
@@ -398,7 +420,7 @@
    for (j=0;j<N;j++)
    {
       P[j] = s*Y[best+N-j-1];
-      E += P[j]*P[j];
+      E += NORM_SCALING_1*NORM_SCALING_1*P[j]*P[j];
    }
    E = pred_gain/sqrt(E);
    for (j=0;j<N;j++)
@@ -445,7 +467,7 @@
    for (j=0;j<N;j++)
    {
       P[j] = s*Y[best+N-j-1];
-      E += P[j]*P[j];
+      E += NORM_SCALING_1*NORM_SCALING_1*P[j]*P[j];
    }
    E = pred_gain/sqrt(E);
    for (j=0;j<N;j++)
@@ -470,14 +492,14 @@
          for (j=0;j<N/B;j++)
          {
             P[j*B+i] = Y[(Nmax-N0-j-1)*B+i];
-            E += P[j*B+i]*P[j*B+i];
+            E += NORM_SCALING_1*NORM_SCALING_1*P[j*B+i]*P[j*B+i];
          }
       }
    } else {
       for (j=0;j<N;j++)
       {
          P[j] = Y[j];
-         E += P[j]*P[j];
+         E += NORM_SCALING_1*NORM_SCALING_1*P[j]*P[j];
       }
    }
    E = 1.f/sqrt(E);