Changeset 823 for pjproject/trunk/pjmedia/src/pjmedia/echo_speex.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/echo_speex.c (modified) (9 diffs)

pjproject/trunk/pjmedia/src/pjmedia/echo_speex.c

@@ -31 +31 @@
 
 #define THIS_FILE       "echo_speex.c"
-#define BUF_COUNT       20
-#define MIN_PREFETCH    4
-#define MAX_PREFETCH    12
+#define BUF_COUNT       16
+#define MIN_PREFETCH    2
+#define MAX_PREFETCH    (BUF_COUNT*2/3)
 
 
@@ -148 +148 @@
                   "[count=%d, seq=%d]",
                   fq->max_count, timestamp / fq->samples_per_frame));
+        //pjmedia_frame_queue_init(fq, fq->seq_delay, fq->prefetch_count);
         return PJ_ETOOMANY;
     }
@@ -290 +291 @@
     speex_ec *echo;
     int sampling_rate;
-    int disabled, enabled;
     pj_status_t status;
 
@@ -323 +323 @@
     }
 
+    /* Set sampling rate */
+    sampling_rate = clock_rate;
+    speex_echo_ctl(echo->state, SPEEX_ECHO_SET_SAMPLING_RATE, 
+                   &sampling_rate);
+
     echo->preprocess = speex_preprocess_state_init(samples_per_frame, 
                                                    clock_rate);
@@ -332 +337 @@
 
     /* Disable all preprocessing, we only want echo cancellation */
+#if 0
     disabled = 0;
     enabled = 1;
@@ -342 +348 @@
     speex_preprocess_ctl(echo->preprocess, SPEEX_PREPROCESS_SET_DEREVERB, 
                          &disabled);
-
-    /* Set sampling rate */
-    sampling_rate = clock_rate;
-    speex_echo_ctl(echo->state, SPEEX_ECHO_SET_SAMPLING_RATE, 
-                   &sampling_rate);
+#endif
+
+    /* Control echo cancellation in the preprocessor */
+   speex_preprocess_ctl(echo->preprocess, SPEEX_PREPROCESS_SET_ECHO_STATE, 
+                        echo->state);
+
 
     /* Create temporary frame for echo cancellation */
@@ -444 +451 @@
     }
 
-    pjmedia_frame_queue_put(echo->frame_queue, play_frm, 
-                            echo->samples_per_frame*2, echo->play_ts);
+    if (pjmedia_frame_queue_put(echo->frame_queue, play_frm, 
+                                echo->samples_per_frame*2, 
+                                echo->play_ts) != PJ_SUCCESS)
+    {
+        int seq_delay;
+
+        /* On full reset frame queue */
+        seq_delay = ((int)echo->play_ts - (int)echo->rec_ts) / 
+                        (int)echo->samples_per_frame;
+        pjmedia_frame_queue_init(echo->frame_queue, seq_delay,
+                                 echo->prefetch);
+
+        /* And re-put */
+        pjmedia_frame_queue_put(echo->frame_queue, play_frm, 
+                                echo->samples_per_frame*2, 
+                                echo->play_ts);
+    }
 
     pj_lock_release(echo->lock);
@@ -495 +517 @@
         
         if (pjmedia_frame_queue_empty(echo->frame_queue)) {
-            int seq_delay, prefetch;
+            int seq_delay;
 
             seq_delay = ((int)echo->play_ts - (int)echo->rec_ts) / 
                             (int)echo->samples_per_frame;
-            prefetch = pjmedia_frame_queue_get_prefetch(echo->frame_queue);
-            //++prefetch;
-            pjmedia_frame_queue_init(echo->frame_queue, seq_delay, prefetch);
+            pjmedia_frame_queue_init(echo->frame_queue, seq_delay, 
+                                     echo->prefetch);
             status = -1;
 
@@ -538 +559 @@
 
     /* Cancel echo, put output in temporary buffer */
-    speex_echo_cancel(echo->state, (const spx_int16_t*)rec_frm, 
-                      (const spx_int16_t*)play_frm, 
-                      (spx_int16_t*)echo->tmp_frame, 
-                      echo->residue);
+    speex_echo_cancellation(echo->state, (const spx_int16_t*)rec_frm,
+                            (const spx_int16_t*)play_frm,
+                            (spx_int16_t*)echo->tmp_frame);
 
 
     /* Preprocess output */
-    speex_preprocess(echo->preprocess, (spx_int16_t*)echo->tmp_frame, 
-                     echo->residue);
+    speex_preprocess_run(echo->preprocess, (spx_int16_t*)echo->tmp_frame);
 
     /* Copy temporary buffer back to original rec_frm */