Changeset 653 for pjproject/trunk/pjmedia/src/pjmedia/echo_port.c

Timestamp:

Aug 6, 2006 12:07:13 PM (18 years ago)

Author:

bennylp

Message:

Change AEC into generic echo canceller framework with either AEC or simple echo suppressor backend can be selected during runtime.

File:

• pjproject/trunk/pjmedia/src/pjmedia/echo_port.c (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia/aec_port.c) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia/echo_port.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#include <pjmedia/aec_port.h>
-#include <pjmedia/aec.h>
+#include <pjmedia/echo_port.h>
+#include <pjmedia/echo.h>
 #include <pjmedia/errno.h>
 #include <pj/assert.h>
@@ -25 +25 @@
 
 
-#define THIS_FILE   "aec_port.c"
-#define SIGNATURE   PJMEDIA_PORT_SIGNATURE('A', 'E', 'C', ' ')
+#define THIS_FILE   "ec_port.c"
+#define SIGNATURE   PJMEDIA_PORT_SIGNATURE('E', 'C', 'H', 'O')
 #define BUF_COUNT   32
 
-struct aec
+struct ec
 {
-    pjmedia_port     base;
-    pjmedia_port    *dn_port;
-    pjmedia_aec     *aec;
+    pjmedia_port         base;
+    pjmedia_port        *dn_port;
+    pjmedia_echo_state  *ec;
 };
 
 
-static pj_status_t aec_put_frame(pjmedia_port *this_port, 
-                                 const pjmedia_frame *frame);
-static pj_status_t aec_get_frame(pjmedia_port *this_port, 
-                                  pjmedia_frame *frame);
-static pj_status_t aec_on_destroy(pjmedia_port *this_port);
+static pj_status_t ec_put_frame(pjmedia_port *this_port, 
+                                const pjmedia_frame *frame);
+static pj_status_t ec_get_frame(pjmedia_port *this_port, 
+                                pjmedia_frame *frame);
+static pj_status_t ec_on_destroy(pjmedia_port *this_port);
 
 
-PJ_DEF(pj_status_t) pjmedia_aec_port_create( pj_pool_t *pool,
+PJ_DEF(pj_status_t) pjmedia_echo_port_create(pj_pool_t *pool,
                                              pjmedia_port *dn_port,
                                              unsigned tail_ms,
+                                             unsigned options,
                                              pjmedia_port **p_port )
 {
-    const pj_str_t AEC = { "AEC", 3 };
-    struct aec *aec;
+    const pj_str_t AEC = { "EC", 2 };
+    struct ec *ec;
     pj_status_t status;
 
@@ -58 +59 @@
 
     /* Create the port and the AEC itself */
-    aec = pj_pool_zalloc(pool, sizeof(struct aec));
+    ec = pj_pool_zalloc(pool, sizeof(struct ec));
     
-    pjmedia_port_info_init(&aec->base.info, &AEC, SIGNATURE,
+    pjmedia_port_info_init(&ec->base.info, &AEC, SIGNATURE,
                            dn_port->info.clock_rate, 
                            dn_port->info.channel_count, 
@@ -66 +67 @@
                            dn_port->info.samples_per_frame);
 
-    status = pjmedia_aec_create(pool, dn_port->info.clock_rate, 
-                                dn_port->info.samples_per_frame,
-                                tail_ms, 0, &aec->aec);
+    status = pjmedia_echo_create(pool, dn_port->info.clock_rate, 
+                                 dn_port->info.samples_per_frame,
+                                 tail_ms, options, &ec->ec);
     if (status != PJ_SUCCESS)
         return status;
 
     /* More init */
-    aec->dn_port = dn_port;
-    aec->base.get_frame = &aec_get_frame;
-    aec->base.put_frame = &aec_put_frame;
-    aec->base.on_destroy = &aec_on_destroy;
+    ec->dn_port = dn_port;
+    ec->base.get_frame = &ec_get_frame;
+    ec->base.put_frame = &ec_put_frame;
+    ec->base.on_destroy = &ec_on_destroy;
 
     /* Done */
-    *p_port = &aec->base;
+    *p_port = &ec->base;
 
     return PJ_SUCCESS;
@@ -85 +86 @@
 
 
-static pj_status_t aec_put_frame(pjmedia_port *this_port, 
+static pj_status_t ec_put_frame( pjmedia_port *this_port, 
                                  const pjmedia_frame *frame)
 {
-    struct aec *aec = (struct aec*)this_port;
+    struct ec *ec = (struct ec*)this_port;
 
     PJ_ASSERT_RETURN(this_port->info.signature == SIGNATURE, PJ_EINVAL);
 
     if (frame->type == PJMEDIA_FRAME_TYPE_NONE ) {
-        return pjmedia_port_put_frame(aec->dn_port, frame);
+        return pjmedia_port_put_frame(ec->dn_port, frame);
     }
 
@@ -99 +100 @@
                      PJ_EINVAL);
 
-    pjmedia_aec_capture(aec->aec, frame->buf, 0);
+    pjmedia_echo_capture(ec->ec, frame->buf, 0);
 
-    return pjmedia_port_put_frame(aec->dn_port, frame);
+    return pjmedia_port_put_frame(ec->dn_port, frame);
 }
 
 
-static pj_status_t aec_get_frame( pjmedia_port *this_port, 
-                                  pjmedia_frame *frame)
+static pj_status_t ec_get_frame( pjmedia_port *this_port, 
+                                 pjmedia_frame *frame)
 {
-    struct aec *aec = (struct aec*)this_port;
+    struct ec *ec = (struct ec*)this_port;
     pj_status_t status;
 
     PJ_ASSERT_RETURN(this_port->info.signature == SIGNATURE, PJ_EINVAL);
 
-    status = pjmedia_port_get_frame(aec->dn_port, frame);
+    status = pjmedia_port_get_frame(ec->dn_port, frame);
     if (status!=PJ_SUCCESS || frame->type!=PJMEDIA_FRAME_TYPE_AUDIO) {
         pjmedia_zero_samples(frame->buf, this_port->info.samples_per_frame);
     }
 
-    pjmedia_aec_playback(aec->aec, frame->buf);
+    pjmedia_echo_playback(ec->ec, frame->buf);
 
     return status;
@@ -124 +125 @@
 
 
-static pj_status_t aec_on_destroy(pjmedia_port *this_port)
+static pj_status_t ec_on_destroy(pjmedia_port *this_port)
 {
-    struct aec *aec = (struct aec*)this_port;
+    struct ec *ec = (struct ec*)this_port;
 
     PJ_ASSERT_RETURN(this_port->info.signature == SIGNATURE, PJ_EINVAL);
 
-    pjmedia_aec_destroy(aec->aec);
+    pjmedia_echo_destroy(ec->ec);
 
     return PJ_SUCCESS;