Changeset 648 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.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/pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -969 +969 @@
     pj_assert(conf_port != NULL);
 
-    /* Create AEC if it's not created */
-    if (pjsua_var.aec_port == NULL && pjsua_var.media_cfg.ec_tail_len) {
-        status = pjmedia_aec_port_create(pjsua_var.pool, conf_port,
-                                         conf_port->info.clock_rate * 
-                                            pjsua_var.media_cfg.ec_tail_len /
-                                            1000,
-                                         &pjsua_var.aec_port);
-        if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "Unable to create AEC port", status);
-            pjmedia_snd_port_destroy(pjsua_var.snd_port);
-            pjsua_var.snd_port = NULL;
-            return status;
-        }
-    }
-
-    /* Connect to the AEC port */
-    status = pjmedia_snd_port_connect(pjsua_var.snd_port, 
-                                      pjsua_var.media_cfg.ec_tail_len ? 
-                                        pjsua_var.aec_port : conf_port );
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to connect conference port to "
-                                "sound device", status);
-        pjmedia_snd_port_destroy(pjsua_var.snd_port);
-        pjsua_var.snd_port = NULL;
-        return status;
-    }
+    /* Set AEC */
+    pjmedia_snd_port_set_aec(pjsua_var.snd_port, pjsua_var.pool, 
+                             pjsua_var.media_cfg.ec_tail_len);
 
     /* Save the device IDs */
@@ -1054 +1031 @@
 
 
+/*
+ * Configure the AEC settings of the sound port.
+ */
+PJ_DEF(pj_status_t) pjsua_set_aec(unsigned tail_ms)
+{
+    pjsua_var.media_cfg.ec_tail_len = tail_ms;
+
+    if (pjsua_var.snd_port)
+        return pjmedia_snd_port_set_aec(pjsua_var.snd_port, pjsua_var.pool,
+                                        tail_ms);
+    
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Get current AEC tail length.
+ */
+PJ_DEF(pj_status_t) pjsua_get_aec(unsigned *p_tail_ms)
+{
+    *p_tail_ms = pjsua_var.media_cfg.ec_tail_len;
+    return PJ_SUCCESS;
+}
+
 
 /*****************************************************************************