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

pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

@@ -35 +35 @@
 
 //#define SIMULATE_LOST_PCT   20
-#define AEC_TAIL    500     /* in ms */
+#define AEC_TAIL    128     /* default AEC length in ms */
 
 #define THIS_FILE           "sound_port.c"
@@ -58 +58 @@
 
     pjmedia_aec         *aec;
+    unsigned             aec_tail_len;
     pjmedia_plc         *plc;
 
@@ -136 +137 @@
 
 
-    if (snd_port->aec) {
-        pjmedia_aec_playback(snd_port->aec, output);
-    }
-
     return PJ_SUCCESS;
 }
@@ -156 +153 @@
     pjmedia_port *port;
     pjmedia_frame frame;
-
-    /* Cancel echo */
-    if (snd_port->aec) {
-        pjmedia_aec_capture(snd_port->aec, input, 0);
-    }
 
     /* We're risking accessing the port without holding any mutex.
@@ -171 +163 @@
     if (port == NULL)
         return PJ_SUCCESS;
+
+    /* Cancel echo */
+    if (snd_port->aec) {
+        pjmedia_aec_capture(snd_port->aec, input, 0);
+    }
 
     frame.buf = (void*)input;
@@ -247 +244 @@
                                         snd_port->channel_count,
                                     0, &snd_port->plc);
-        if (status != PJ_SUCCESS)
+        if (status != PJ_SUCCESS) {
+            PJ_LOG(4,(THIS_FILE, "Unable to create PLC"));
             snd_port->plc = NULL;
+        }
     }
 
     /* Create AEC only when direction is full duplex */
     if (snd_port->dir == PJMEDIA_DIR_CAPTURE_PLAYBACK) {
-        status = pjmedia_aec_create(pool, snd_port->clock_rate, 
-                                    snd_port->samples_per_frame, 
-                                    snd_port->clock_rate * AEC_TAIL / 1000,
-                                    0, &snd_port->aec);
-        if (status != PJ_SUCCESS)
+        status = pjmedia_snd_port_set_aec(snd_port, pool, AEC_TAIL);
+        if (status != PJ_SUCCESS) {
+            PJ_LOG(4,(THIS_FILE, "Unable to create AEC"));
             snd_port->aec = NULL;
+        }
     }
 
@@ -433 +431 @@
 
 /*
+ * Enable AEC
+ */
+PJ_DEF(pj_status_t) pjmedia_snd_port_set_aec( pjmedia_snd_port *snd_port,
+                                              pj_pool_t *pool,
+                                              unsigned tail_ms)
+{
+    pj_status_t status;
+
+    /* Sound must be opened in full-duplex mode */
+    PJ_ASSERT_RETURN(snd_port && 
+                     snd_port->dir == PJMEDIA_DIR_CAPTURE_PLAYBACK,
+                     PJ_EINVALIDOP);
+
+    /* Destroy AEC */
+    if (snd_port->aec) {
+        pjmedia_aec_destroy(snd_port->aec);
+        snd_port->aec = NULL;
+    }
+
+    snd_port->aec_tail_len = tail_ms;
+
+    if (tail_ms != 0) {
+        status = pjmedia_aec_create(pool, snd_port->clock_rate, 
+                                    snd_port->samples_per_frame, 
+                                    snd_port->clock_rate * tail_ms / 1000,
+                                    0, &snd_port->aec);
+        if (status != PJ_SUCCESS)
+            snd_port->aec = NULL;
+    } else {
+        status = PJ_SUCCESS;
+    }
+
+    return status;
+}
+
+
+/* Get AEC tail length */
+PJ_DEF(pj_status_t) pjmedia_snd_port_get_aec_tail( pjmedia_snd_port *snd_port,
+                                                   unsigned *p_length)
+{
+    PJ_ASSERT_RETURN(snd_port && p_length, PJ_EINVAL);
+    *p_length =  snd_port->aec ? snd_port->aec_tail_len : 0;
+    return PJ_SUCCESS;
+}
+
+
+
+/*
  * Connect a port.
  */