Changeset 642

Timestamp:

Aug 2, 2006 6:22:22 PM (18 years ago)

Author:

bennylp

Message:

Added experimental AEC media port (aec_port.[hc]) based on Speex AEC in pjmedia and pjsua-lib.

Location:

pjproject/trunk

Files:

• pjmedia/build/pjmedia.dsp (modified) (4 diffs)
• pjmedia/include/pjmedia.h (modified) (1 diff)
• pjmedia/include/pjmedia/aec_port.h (added)
• pjmedia/src/pjmedia/aec_port.c (added)
• pjsip/include/pjsua-lib/pjsua.h (modified) (2 diffs)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -42 +42 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /D "NDEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /I "../src/pjmedia-codec" /D "NDEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -66 +66 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /D "_DEBUG" /D "PA_NO_ASIO" /D "PA_NO_WMME" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /I "../src/pjmedia-codec" /D "_DEBUG" /D "PA_NO_ASIO" /D "PA_NO_WMME" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -88 +88 @@
 # Begin Source File
 
+SOURCE=..\src\pjmedia\aec_port.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjmedia\alaw_ulaw.c
 # End Source File
@@ -226 +230 @@
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\include\pjmedia\aec_port.h
+# End Source File
 # Begin Source File
 

pjproject/trunk/pjmedia/include/pjmedia.h

@@ -26 +26 @@
 
 #include <pjmedia/types.h>
+#include <pjmedia/aec_port.h>
 #include <pjmedia/clock.h>
 #include <pjmedia/codec.h>

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2129 +2129 @@
     unsigned            rx_drop_pct;
 
+    /**
+     * Echo canceller tail length, in miliseconds.
+     *
+     * Default: 256
+     */
+    unsigned            ec_tail_len;
 };
 
@@ -2147 +2153 @@
     cfg->quality = 6;
     cfg->ilbc_mode = 20;
+    cfg->ec_tail_len = 256;
 }
 

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -205 +205 @@
     int                  cap_dev;   /**< Capture device ID.             */
     int                  play_dev;  /**< Playback device ID.            */
+    pjmedia_port        *aec_port;  /**< AEC port to conf bridge.       */
     pj_bool_t            no_snd;    /**< No sound (app will manage it)  */
     pjmedia_snd_port    *snd_port;  /**< Sound port.                    */

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

@@ -969 +969 @@
     pj_assert(conf_port != NULL);
 
-    /* Connect to the conference port */
-    status = pjmedia_snd_port_connect(pjsua_var.snd_port, conf_port);
+    /* Create AEC if it's not created */
+    if (pjsua_var.aec_port == NULL) {
+        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.aec_port);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to connect conference port to "