Changeset 628 for pjproject/trunk/pjmedia/src/pjmedia-codec/speex/cb_search.c

Timestamp:

Jul 26, 2006 5:04:54 PM (18 years ago)

Author:

bennylp

Message:

• Bring speex codec up to date with their SVN trunk
• Speex codec should work in FIXED_POINT mode when PJ_HAS_FLOATING_POINT is set to zero.
• ulaw2linear will return zero if zero is given (this would make the VAD works better, and it also fixed click noise when call is established/hangup).

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/speex/cb_search.c (modified) (15 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/speex/cb_search.c

@@ -71 +71 @@
             resj = MAC16_16(resj,shape[k],r[j-k]);
 #ifdef FIXED_POINT
-         res16 = EXTRACT16(SHR32(resj, 11));
+         res16 = EXTRACT16(SHR32(resj, 13));
 #else
          res16 = 0.03125f*resj;
@@ -89 +89 @@
 {
    int n;
-   int q=0;
-   for (n=0;n<len;n++,q++)
-      t[n] = SUB32(t[n],MULT16_16_Q11_32(g,r[q]));
+   for (n=0;n<len;n++)
+      t[n] = SUB16(t[n],PSHR32(MULT16_16(g,r[n]),13));
 }
 #endif
@@ -98 +97 @@
 
 static void split_cb_search_shape_sign_N1(
-spx_sig_t target[],                     /* target vector */
+spx_word16_t target[],                  /* target vector */
 spx_coef_t ak[],                        /* LPCs for this subframe */
 spx_coef_t awk1[],                      /* Weighted LPCs for this subframe */
@@ -114 +113 @@
 {
    int i,j,m,q;
-#ifndef FIXED_POINT
-   int n;
-#endif
    VARDECL(spx_word16_t *resp);
 #ifdef _USE_SSE
@@ -159 +155 @@
    /* FIXME: make that adaptive? */
    for (i=0;i<nsf;i++)
-      t[i]=EXTRACT16(PSHR32(target[i],6));
+      t[i]=target[i];
 
    compute_weighted_codebook(shape_cb, r, resp, resp2, E, shape_cb_size, subvect_size, stack);
@@ -223 +219 @@
 #ifdef FIXED_POINT
          g=sign*shape_cb[rind*subvect_size+m];
+#else
+         g=sign*0.03125*shape_cb[rind*subvect_size+m];
+#endif
          target_update(t+subvect_size*(i+1), g, r+q, nsf-subvect_size*(i+1));
-#else
-         g=sign*0.03125*shape_cb[rind*subvect_size+m];
-         /*FIXME: I think that one too can be replaced by target_update */
-         for (n=subvect_size*(i+1);n<nsf;n++,q++)
-            t[n] = SUB32(t[n],g*r[q]);
-#endif
       }
    }
@@ -245 +238 @@
       syn_percep_zero(e, ak, awk1, awk2, r2, nsf,p, stack);
       for (j=0;j<nsf;j++)
-         target[j]=SUB32(target[j],r2[j]);
+         target[j]=SUB16(target[j],EXTRACT16(PSHR32(r2[j],8)));
    }
 }
@@ -252 +245 @@
 
 void split_cb_search_shape_sign(
-spx_sig_t target[],                     /* target vector */
+spx_word16_t target[],                  /* target vector */
 spx_coef_t ak[],                        /* LPCs for this subframe */
 spx_coef_t awk1[],                      /* Weighted LPCs for this subframe */
@@ -357 +350 @@
    /* FIXME: make that adaptive? */
    for (i=0;i<nsf;i++)
-      t[i]=EXTRACT16(PSHR32(target[i],6));
+      t[i]=target[i];
 
    for (j=0;j<N;j++)
@@ -445 +438 @@
 #ifdef FIXED_POINT
             g=sign*shape_cb[rind*subvect_size+m];
+#else
+            g=sign*0.03125*shape_cb[rind*subvect_size+m];
+#endif
             target_update(nt[j]+subvect_size*(i+1), g, r+q, nsf-subvect_size*(i+1));
-#else
-            g=sign*0.03125*shape_cb[rind*subvect_size+m];
-            /*FIXME: I think that one too can be replaced by target_update */
-            for (n=subvect_size*(i+1);n<nsf;n++,q++)
-               nt[j][n] = SUB32(nt[j][n],g*r[q]);
-#endif
          }
 
@@ -515 +505 @@
       syn_percep_zero(e, ak, awk1, awk2, r2, nsf,p, stack);
       for (j=0;j<nsf;j++)
-         target[j]=SUB32(target[j],r2[j]);
+         target[j]=SUB16(target[j],EXTRACT16(PSHR32(r2[j],8)));
    }
 }
@@ -578 +568 @@
 
 void noise_codebook_quant(
-spx_sig_t target[],                     /* target vector */
+spx_word16_t target[],                  /* target vector */
 spx_coef_t ak[],                        /* LPCs for this subframe */
 spx_coef_t awk1[],                      /* Weighted LPCs for this subframe */
@@ -596 +586 @@
    VARDECL(spx_sig_t *tmp);
    ALLOC(tmp, nsf, spx_sig_t);
-   residue_percep_zero(target, ak, awk1, awk2, tmp, nsf, p, stack);
+   for (i=0;i<nsf;i++)
+      tmp[i]=PSHR32(EXTEND32(target[i]),SIG_SHIFT);
+   residue_percep_zero(tmp, ak, awk1, awk2, tmp, nsf, p, stack);
 
    for (i=0;i<nsf;i++)
@@ -602 +594 @@
    for (i=0;i<nsf;i++)
       target[i]=0;
-
 }
 
@@ -614 +605 @@
 )
 {
-   speex_rand_vec(1, exc, nsf);
+   int i;
+   /* FIXME: This is bad, but I don't think the function ever gets called anyway */
+   spx_int32_t seed = 0;
+   for (i=0;i<nsf;i++)
+      exc[i]=SHL32(EXTEND32(speex_rand(1, &seed)),SIG_SHIFT);
 }