Changeset 648 for pjproject/trunk/pjmedia/src/pjmedia/aec_speex.c

Timestamp:

Aug 4, 2006 6:27:19 PM (18 years ago)

Author:

bennylp

Message:

More work on the AEC (including changes in PJSUA), embed the AEC in sound_port, reduce DirectSound? buffer from 32 to 16, and fixed ARM compilation for MSVC WinCE target.

File:

• pjproject/trunk/pjmedia/src/pjmedia/aec_speex.c (modified) (10 diffs)

pjproject/trunk/pjmedia/src/pjmedia/aec_speex.c

@@ -27 +27 @@
 #include <pj/pool.h>
 #include <speex/speex_echo.h>
+#include <speex/speex_preprocess.h>
 
 
 #define THIS_FILE   "aec_speex.c"
-#define BUF_COUNT   16
+#define BUF_COUNT   8
 
 
@@ -40 +41 @@
 struct pjmedia_aec
 {
-    SpeexEchoState  *state;
+    SpeexEchoState       *state;
+    SpeexPreprocessState *preprocess;
+
     unsigned         samples_per_frame;
     unsigned         options;
     pj_int16_t      *tmp_frame;
+    spx_int32_t     *residue;
 
     pj_lock_t       *lock;              /* To protect buffers, if required  */
@@ -60 +64 @@
                                         unsigned clock_rate,
                                         unsigned samples_per_frame,
-                                        unsigned tail_size,
+                                        unsigned tail_ms,
                                         unsigned options,
                                         pjmedia_aec **p_aec )
@@ -69 +73 @@
     pj_status_t status;
 
+    *p_aec = NULL;
+
     aec = pj_pool_zalloc(pool, sizeof(pjmedia_aec));
     PJ_ASSERT_RETURN(aec != NULL, PJ_ENOMEM);
@@ -79 +85 @@
     aec->options = options;
 
-    aec->state = speex_echo_state_init(samples_per_frame,tail_size);
+    aec->state = speex_echo_state_init(samples_per_frame,
+                                        clock_rate * tail_ms / 1000);
     if (aec->state == NULL) {
+        pj_lock_destroy(aec->lock);
+        return PJ_ENOMEM;
+    }
+
+    aec->preprocess = speex_preprocess_state_init(samples_per_frame, 
+                                                  clock_rate);
+    if (aec->preprocess == NULL) {
+        speex_echo_state_destroy(aec->state);
         pj_lock_destroy(aec->lock);
         return PJ_ENOMEM;
@@ -91 +106 @@
 
     /* Create temporary frame for echo cancellation */
-    aec->tmp_frame = pj_pool_zalloc(pool, sizeof(pj_int16_t) *
+    aec->tmp_frame = pj_pool_zalloc(pool, 2 * samples_per_frame);
+    PJ_ASSERT_RETURN(aec->tmp_frame != NULL, PJ_ENOMEM);
+
+    /* Create temporary frame to receive residue */
+    aec->residue = pj_pool_zalloc(pool, sizeof(spx_int32_t) * 
                                             samples_per_frame);
-    PJ_ASSERT_RETURN(aec->tmp_frame != NULL, PJ_ENOMEM);
+    PJ_ASSERT_RETURN(aec->residue != NULL, PJ_ENOMEM);
 
     /* Create internal playback buffers */
@@ -109 +128 @@
                          clock_rate,
                          samples_per_frame,
-                         tail_size * 1000 / clock_rate));
+                         tail_ms));
     return PJ_SUCCESS;
 
@@ -121 +140 @@
 {
     PJ_ASSERT_RETURN(aec && aec->state, PJ_EINVAL);
+
+    if (aec->lock)
+        pj_lock_acquire(aec->lock);
 
     if (aec->state) {
         speex_echo_state_destroy(aec->state);
         aec->state = NULL;
+    }
+
+    if (aec->preprocess) {
+        speex_preprocess_state_destroy(aec->preprocess);
+        aec->preprocess = NULL;
     }
 
@@ -225 +252 @@
                                              void *reserved )
 {
-    unsigned level0, level1;
-
     /* Sanity checks */
     PJ_ASSERT_RETURN(aec && rec_frm && play_frm && options==0 &&
@@ -234 +259 @@
     speex_echo_cancel(aec->state, (const spx_int16_t*)rec_frm, 
                       (const spx_int16_t*)play_frm, 
-                      (spx_int16_t*)aec->tmp_frame, NULL);
-
-#if 0
-    level0 = pjmedia_calc_avg_signal(rec_frm, aec->samples_per_frame);
-    level1 = pjmedia_calc_avg_signal(aec->tmp_frame, aec->samples_per_frame);
-
-    if (level1 < level0) {
-        PJ_LOG(5,(THIS_FILE, "Input signal reduced from %d to %d",
-                  level0, level1));
-    }
-#else
-    PJ_UNUSED_ARG(level0);
-    PJ_UNUSED_ARG(level1);
-#endif
+                      (spx_int16_t*)aec->tmp_frame, 
+                      aec->residue);
+
+
+    /* Preprocess output */
+    speex_preprocess(aec->preprocess, (spx_int16_t*)aec->tmp_frame, 
+                     aec->residue);
 
     /* Copy temporary buffer back to original rec_frm */