Changeset 655 for pjproject/trunk/pjmedia/src/pjmedia/echo_suppress.c

Timestamp:

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

Author:

bennylp

Message:

Change the silence suppressor to use the adaptive silence detector.

File:

• pjproject/trunk/pjmedia/src/pjmedia/echo_suppress.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia/echo_suppress.c

@@ -28 +28 @@
 
 #define THIS_FILE                           "echo_suppress.c"
-#define PJMEDIA_ECHO_SUPPRESS_THRESHOLD     20
+#define PJMEDIA_ECHO_SUPPRESS_THRESHOLD     PJMEDIA_SILENCE_DET_THRESHOLD
 
 
@@ -36 +36 @@
 typedef struct echo_supp
 {
-    unsigned    threshold;
-    pj_bool_t   suppressing;
-    pj_time_val last_signal;
-    unsigned    samples_per_frame;
-    unsigned    tail_ms;
+    pj_bool_t            suppressing;
+    pjmedia_silence_det *sd;
+    pj_time_val          last_signal;
+    unsigned             samples_per_frame;
+    unsigned             tail_ms;
 } echo_supp;
 
@@ -79 +79 @@
 {
     echo_supp *ec;
+    pj_status_t status;
 
     PJ_UNUSED_ARG(clock_rate);
@@ -84 +85 @@
 
     ec = pj_pool_zalloc(pool, sizeof(struct echo_supp));
-    ec->threshold = PJMEDIA_ECHO_SUPPRESS_THRESHOLD;
     ec->samples_per_frame = samples_per_frame;
     ec->tail_ms = tail_ms;
+
+    status = pjmedia_silence_det_create(pool, clock_rate, samples_per_frame,
+                                        &ec->sd);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    pjmedia_silence_det_set_name(ec->sd, "ecsu%p");
+    pjmedia_silence_det_set_adaptive(ec->sd, PJMEDIA_ECHO_SUPPRESS_THRESHOLD);
+    pjmedia_silence_det_set_params(ec->sd, 0, 500, 3000);
 
     *p_state = ec;
@@ -110 +119 @@
 {
     echo_supp *ec = state;
+    pj_bool_t silence;
     pj_bool_t last_suppressing = ec->suppressing;
-    unsigned level;
 
-    level = pjmedia_calc_avg_signal(play_frm, ec->samples_per_frame);
-    level = linear2ulaw(level) ^ 0xff;
+    silence = pjmedia_silence_det_detect(ec->sd, play_frm,
+                                         ec->samples_per_frame, NULL);
 
-    if (level >= ec->threshold) {
+    ec->suppressing = !silence;
+
+    if (ec->suppressing) {
         pj_gettimeofday(&ec->last_signal);
-        ec->suppressing = 1;
-    } else {
-        ec->suppressing = 0;
     }
 
@@ -169 +177 @@
 {
     echo_supp *ec = state;
-    unsigned level;
+    pj_bool_t silence;
 
     PJ_UNUSED_ARG(options);
     PJ_UNUSED_ARG(reserved);
 
-    level = pjmedia_calc_avg_signal(play_frm, ec->samples_per_frame);
-    level = linear2ulaw(level) ^ 0xff;
+    silence = pjmedia_silence_det_detect(ec->sd, play_frm, 
+                                         ec->samples_per_frame, NULL);
 
-    if (level >= ec->threshold) {
+    if (!silence) {
         pjmedia_zero_samples(rec_frm, ec->samples_per_frame);
     }