Changeset 3115 for pjproject/trunk/pjmedia/src/pjmedia/echo_common.c

Timestamp:

Mar 3, 2010 2:47:35 PM (14 years ago)

Author:

nanang

Message:

Ticket #1042, minor updates related to AEC:

• Added requirement of AEC minimal latency between reference and echo in aectest sample app.
• Modified AEC latency in sound port to 3/4 of playback latency.
• Few cleaned up echo_common.c: unused vars, a bit stricter latency check (to be at least as much as PTIME).

File:

• pjproject/trunk/pjmedia/src/pjmedia/echo_common.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/echo_common.c

@@ -25 +25 @@
 #include <pj/list.h>
 #include <pj/log.h>
+#include <pj/math.h>
 #include <pj/pool.h>
 #include "echo_internal.h"
@@ -47 +48 @@
 
     pj_bool_t        lat_ready;     /* lat_buf has been filled in.          */
-    unsigned         lat_target_cnt;/* Target number of frames in lat_buf   */
-    unsigned         lat_buf_cnt;   /* Actual number of frames in lat_buf   */
     struct frame     lat_buf;       /* Frame queue for delayed playback     */
     struct frame     lat_free;      /* Free frame list.                     */
@@ -145 +144 @@
                                          pjmedia_echo_state **p_echo )
 {
-    unsigned ptime;
+    unsigned ptime, lat_cnt;
     pjmedia_echo_state *ec;
     pj_status_t status;
@@ -195 +194 @@
     /* Create latency buffers */
     ptime = samples_per_frame * 1000 / clock_rate;
-    if (latency_ms == 0) {
+    if (latency_ms > ptime) {
+        /* Normalize latency with delaybuf/WSOLA latency */
+        latency_ms -= PJ_MIN(ptime, PJMEDIA_WSOLA_DELAY_MSEC);
+    }
+    if (latency_ms < ptime) {
         /* Give at least one frame delay to simplify programming */
         latency_ms = ptime;
     }
-    ec->lat_target_cnt = latency_ms / ptime;
-    if (ec->lat_target_cnt != 0) {
-        unsigned i;
-        for (i=0; i < ec->lat_target_cnt; ++i)  {
-            struct frame *frm;
-
-            frm = (struct frame*) pj_pool_alloc(pool, (samples_per_frame<<1) +
-                                                      sizeof(struct frame));
-            pj_list_push_back(&ec->lat_free, frm);
-        }
-    } else {
-        ec->lat_ready = PJ_TRUE;
+    lat_cnt = latency_ms / ptime;
+    while (lat_cnt--)  {
+        struct frame *frm;
+
+        frm = (struct frame*) pj_pool_alloc(pool, (samples_per_frame<<1) +
+                                                  sizeof(struct frame));
+        pj_list_push_back(&ec->lat_free, frm);
     }