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

Timestamp:

Nov 23, 2006 10:19:46 AM (17 years ago)

Author:

bennylp

Message:

Updated Speex to their latest SVN (1.2-beta). AEC seems
to work much better now and take less CPU, so I increased
default tail length in PJSUA to 800ms.

File:

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

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

@@ -1 @@
-/* Copyright (C) 2002 Jean-Marc Valin 
+/* Copyright (C) 2002-2006 Jean-Marc Valin 
    File: cb_search.c
 
@@ -86 +86 @@
 
 #ifndef OVERRIDE_TARGET_UPDATE
-PJ_INLINE(void) target_update(spx_word16_t *t, spx_word16_t g, spx_word16_t *r, int len)
+static inline void target_update(spx_word16_t *t, spx_word16_t g, spx_word16_t *r, int len)
 {
    int n;
@@ -108 +108 @@
 SpeexBits *bits,
 char *stack,
-int   complexity,
 int   update_target
 )
@@ -126 +125 @@
    int shape_cb_size, subvect_size, nb_subvect;
    const split_cb_params *params;
-   int N=2;
    int best_index;
    spx_word32_t best_dist;
    int have_sign;
-   N=complexity;
-   if (N>10)
-      N=10;
-   if (N<1)
-      N=1;
    
    params = (const split_cb_params *) par;
@@ -153 +146 @@
    ALLOC(e, nsf, spx_sig_t);
    
-   /* FIXME: make that adaptive? */
+   /* FIXME: Do we still need to copy the target? */
    for (i=0;i<nsf;i++)
       t[i]=target[i];
@@ -294 +287 @@
    if (N>10)
       N=10;
+   /* Complexity isn't as important for the codebooks as it is for the pitch */
+   N=(2*N)/3;
    if (N<1)
       N=1;
-   
    if (N==1)
    {
-      split_cb_search_shape_sign_N1(target,ak,awk1,awk2,par,p,nsf,exc,r,bits,stack,complexity,update_target);
+      split_cb_search_shape_sign_N1(target,ak,awk1,awk2,par,p,nsf,exc,r,bits,stack,update_target);
       return;
    }
@@ -348 +342 @@
    }
    
-   /* FIXME: make that adaptive? */
    for (i=0;i<nsf;i++)
       t[i]=target[i];
@@ -515 +508 @@
 int   nsf,                      /* number of samples in subframe */
 SpeexBits *bits,
-char *stack
+char *stack,
+spx_int32_t *seed
 )
 {
@@ -602 +596 @@
 int   nsf,                      /* number of samples in subframe */
 SpeexBits *bits,
-char *stack
+char *stack,
+spx_int32_t *seed
 )
 {
    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);
+      exc[i]=SHL32(EXTEND32(speex_rand(1, seed)),SIG_SHIFT);
 }