Changeset 2204

Timestamp:

Aug 11, 2008 6:10:42 PM (16 years ago)

Author:

bennylp

Message:

Related to ticket #590: added command line option in pjsua to select the echo canceller algorithm to use

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -236 +236 @@
     puts  ("  --no-vad            Disable VAD/silence detector (default=vad enabled)");
     puts  ("  --ec-tail=MSEC      Set echo canceller tail length (default=256)");
+    puts  ("  --ec-opt=OPT        Select echo canceller algorithm (0=default, ");
+    puts  ("                        1=speex, 2=suppressor)");
     puts  ("  --ilbc-mode=MODE    Set iLBC codec mode (20 or 30, default is 20)");
     puts  ("  --capture-dev=id    Audio capture device ID (default=-1)");
@@ -463 +465 @@
            OPT_ILBC_MODE, OPT_REC_FILE, OPT_AUTO_REC,
            OPT_COMPLEXITY, OPT_QUALITY, OPT_PTIME, OPT_NO_VAD,
-           OPT_RX_DROP_PCT, OPT_TX_DROP_PCT, OPT_EC_TAIL,
+           OPT_RX_DROP_PCT, OPT_TX_DROP_PCT, OPT_EC_TAIL, OPT_EC_OPT,
            OPT_NEXT_ACCOUNT, OPT_NEXT_CRED, OPT_MAX_CALLS, 
            OPT_DURATION, OPT_NO_TCP, OPT_NO_UDP, OPT_THREAD_CNT,
@@ -548 +550 @@
         { "no-vad",     0, 0, OPT_NO_VAD},
         { "ec-tail",    1, 0, OPT_EC_TAIL},
+        { "ec-opt",     1, 0, OPT_EC_OPT},
         { "ilbc-mode",  1, 0, OPT_ILBC_MODE},
         { "rx-drop-pct",1, 0, OPT_RX_DROP_PCT},
@@ -1068 +1071 @@
             break;
 
+        case OPT_EC_OPT:
+            cfg->media_cfg.ec_options = my_atoi(pj_optarg);
+            break;
+
         case OPT_QUALITY:
             cfg->media_cfg.quality = my_atoi(pj_optarg);
@@ -1708 +1715 @@
     }
 
+    /* ec-opt */
+    if (config->media_cfg.ec_options != 0) {
+        pj_ansi_sprintf(line, "--ec-opt %d\n",
+                        config->media_cfg.ec_options);
+        pj_strcat2(&cfg, line);
+    } 
 
     /* ilbc-mode */