Changeset 1325:c551ac0c8428 in mediastreamer2

Timestamp:

Mar 28, 2011 3:02:29 PM (2 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

add 2 options to control echo canceller from mediastream program

Files:

• include/mediastreamer2/msvolume.h (modified) (1 diff)
• src/msvolume.c (modified) (1 diff)
• tests/mediastream.c (modified) (3 diffs)

include/mediastreamer2/msvolume.h

@@ -70 +70 @@
 #define MS_VOLUME_SET_EA_TRANSMIT_THRESHOLD     MS_FILTER_METHOD(MS_VOLUME_ID,17,float)
 
+
+#define MS_VOLUME_MIN_ENERGY_DB         (-120)  /*arbitrary value returned when linear energy is 0*/
+
 extern MSFilterDesc ms_volume_desc;
 

src/msvolume.c

@@ -117 +117 @@
 
 static inline float linear_to_db(float linear){
+        if (linear==0) return MS_VOLUME_MIN_ENERGY_DB;
         return 10*ortp_log10f(linear);
 }

tests/mediastream.c

@@ -53 +53 @@
 
 /* starting values echo canceller */
-static int ec_len_ms=0, ec_delay_ms=250, ec_framesize;
+static int ec_len_ms=0, ec_delay_ms=0, ec_framesize=0;
 
 
@@ -143 +143 @@
                                                                 "[ --bitrate <bits per seconds>]\n"
                                                                 "[ --ec (enable echo canceller)]\n"
+                                                                "[ --ec-tail <echo canceller tail length in ms> ]\n"
+                                                                "[ --ec-delay <echo canceller delay in ms> ]\n"
                                                                 "[ --agc (enable automatic gain control)]\n"
                                                                 "[ --ng (enable noise gate)]\n"
@@ -228 +230 @@
                 }else if (strcmp(argv[i],"--ec")==0){
                         ec=TRUE;
+                }else if (strcmp(argv[i],"--ec-tail")==0){
+                        i++;
+                        ec_len_ms=atoi(argv[i]);
+                }else if (strcmp(argv[i],"--ec-delay")==0){
+                        i++;
+                        ec_delay_ms=atoi(argv[i]);
                 }else if (strcmp(argv[i],"--agc")==0){
                         agc=TRUE;