Changeset 646 for pjproject/trunk/pjmedia/src/pjmedia/aec_port.c

Timestamp:

Aug 4, 2006 11:08:00 AM (18 years ago)

Author:

bennylp

Message:

More experimentation with AEC: (1) added media port to create bidirectional port from two unidirectional ports, (2) split AEC functionality into AEC algorithm (aec.h) and AEC media port (aec_port.h), (3) Added the AEC functionality in the sound_port.c.

File:

• pjproject/trunk/pjmedia/src/pjmedia/aec_port.c (modified) (9 diffs)

pjproject/trunk/pjmedia/src/pjmedia/aec_port.c

@@ -18 +18 @@
  */
 #include <pjmedia/aec_port.h>
-#include "../pjmedia-codec/speex/speex_echo.h"
+#include <pjmedia/aec.h>
 #include <pjmedia/errno.h>
 #include <pj/assert.h>
@@ -27 +27 @@
 #define THIS_FILE   "aec_port.c"
 #define SIGNATURE   PJMEDIA_PORT_SIGNATURE('A', 'E', 'C', ' ')
+#define BUF_COUNT   32
 
-
-struct aec_port
+struct aec
 {
     pjmedia_port     base;
     pjmedia_port    *dn_port;
-    SpeexEchoState  *state;
-    pj_int16_t      *tmp_frame;
-    pj_bool_t        has_frame;
-    pj_int16_t      *last_frame;
+    pjmedia_aec     *aec;
 };
 
@@ -53 +50 @@
 {
     const pj_str_t AEC = { "AEC", 3 };
-    struct aec_port *aec_port;
-    int sampling_rate;
+    struct aec *aec;
+    pj_status_t status;
 
     PJ_ASSERT_RETURN(pool && dn_port && p_port, PJ_EINVAL);
@@ -60 +57 @@
                      PJ_EINVAL);
 
-    /* Create and initialize the port */
-    aec_port = pj_pool_zalloc(pool, sizeof(struct aec_port));
+    /* Create the port and the AEC itself */
+    aec = pj_pool_zalloc(pool, sizeof(struct aec));
     
-    pjmedia_port_info_init(&aec_port->base.info, &AEC, SIGNATURE,
+    pjmedia_port_info_init(&aec->base.info, &AEC, SIGNATURE,
                            dn_port->info.clock_rate, 
                            dn_port->info.channel_count, 
@@ -69 +66 @@
                            dn_port->info.samples_per_frame);
 
-    aec_port->state = speex_echo_state_init(dn_port->info.samples_per_frame,
-                                            tail_length);
-
-    /* Set sampling rate */
-    sampling_rate = 0;
-    speex_echo_ctl(aec_port->state, SPEEX_ECHO_GET_SAMPLING_RATE, 
-                   &sampling_rate);
-    sampling_rate = dn_port->info.clock_rate;
-    speex_echo_ctl(aec_port->state, SPEEX_ECHO_SET_SAMPLING_RATE, 
-                   &sampling_rate);
+    status = pjmedia_aec_create(pool, dn_port->info.clock_rate, 
+                                dn_port->info.samples_per_frame,
+                                tail_length, 0, &aec->aec);
+    if (status != PJ_SUCCESS)
+        return status;
 
     /* More init */
-    aec_port->dn_port = dn_port;
-    aec_port->base.get_frame = &aec_get_frame;
-    aec_port->base.put_frame = &aec_put_frame;
-    aec_port->base.on_destroy = &aec_on_destroy;
-
-    aec_port->last_frame = pj_pool_zalloc(pool, sizeof(pj_int16_t) *
-                                            dn_port->info.samples_per_frame);
-    aec_port->tmp_frame = pj_pool_zalloc(pool, sizeof(pj_int16_t) *
-                                            dn_port->info.samples_per_frame);
+    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;
 
     /* Done */
-    *p_port = &aec_port->base;
+    *p_port = &aec->base;
 
-    PJ_LOG(4,(THIS_FILE, "AEC created for port %.*s, clock_rate=%d, "
-                         "samples per frame=%d, tail length=%d ms", 
-                         (int)dn_port->info.name.slen,
-                         dn_port->info.name.ptr,
-                         dn_port->info.clock_rate,
-                         dn_port->info.samples_per_frame,
-                         tail_length * 1000 / dn_port->info.clock_rate));
     return PJ_SUCCESS;
 }
@@ -108 +88 @@
                                  const pjmedia_frame *frame)
 {
-    struct aec_port *aec_port = (struct aec_port*)this_port;
+    struct aec *aec = (struct aec*)this_port;
 
     PJ_ASSERT_RETURN(this_port->info.signature == SIGNATURE, PJ_EINVAL);
 
-    if (frame->type == PJMEDIA_FRAME_TYPE_NONE || !aec_port->has_frame) {
-        return pjmedia_port_put_frame(aec_port->dn_port, frame);
+    if (frame->type == PJMEDIA_FRAME_TYPE_NONE ) {
+        return pjmedia_port_put_frame(aec->dn_port, frame);
     }
 
@@ -119 +99 @@
                      PJ_EINVAL);
 
-    speex_echo_cancel(aec_port->state, 
-                      (const spx_int16_t*)frame->buf, 
-                      (const spx_int16_t*)aec_port->last_frame,
-                      (spx_int16_t*)aec_port->tmp_frame, 
-                      NULL);
+    pjmedia_aec_capture(aec->aec, frame->buf, 0);
 
-    pjmedia_copy_samples(frame->buf, aec_port->tmp_frame,
-                         this_port->info.samples_per_frame);
-
-    return pjmedia_port_put_frame(aec_port->dn_port, frame);
+    return pjmedia_port_put_frame(aec->dn_port, frame);
 }
 
@@ -135 +108 @@
                                   pjmedia_frame *frame)
 {
-    struct aec_port *aec_port = (struct aec_port*)this_port;
+    struct aec *aec = (struct aec*)this_port;
     pj_status_t status;
 
     PJ_ASSERT_RETURN(this_port->info.signature == SIGNATURE, PJ_EINVAL);
 
-    status = pjmedia_port_get_frame(aec_port->dn_port, frame);
-    if (status==PJ_SUCCESS && frame->type==PJMEDIA_FRAME_TYPE_AUDIO) {
-        aec_port->has_frame = PJ_TRUE;
-        pjmedia_copy_samples(aec_port->tmp_frame, frame->buf,
-                             this_port->info.samples_per_frame);
-    } else {
-        aec_port->has_frame = PJ_FALSE; 
+    status = pjmedia_port_get_frame(aec->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);
 
     return status;
@@ -155 +126 @@
 static pj_status_t aec_on_destroy(pjmedia_port *this_port)
 {
-    struct aec_port *aec_port = (struct aec_port*)this_port;
+    struct aec *aec = (struct aec*)this_port;
 
     PJ_ASSERT_RETURN(this_port->info.signature == SIGNATURE, PJ_EINVAL);
 
-    speex_echo_state_destroy(aec_port->state);
+    pjmedia_aec_destroy(aec->aec);
 
     return PJ_SUCCESS;