Changeset 629 for pjproject/trunk

Timestamp:

Jul 26, 2006 5:05:39 PM (18 years ago)

Author:

bennylp

Message:

Added --ptime and --no-vad option in pjsua

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)

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

@@ -117 +117 @@
     puts  ("  --rtp-port=N        Base port to try for RTP (default=4000)");
     puts  ("  --quality=N         Specify media quality (0-10, default=10)");
-    /*
     puts  ("  --ptime=MSEC        Override codec ptime to MSEC (default=specific)");
-    */
+    puts  ("  --no-vad            Disable VAD/silence detector (default=vad enabled)");
+
     puts  ("");
     puts  ("Buddy List (can be more than one):");
@@ -249 +249 @@
            OPT_AUTO_CONF, OPT_CLOCK_RATE,
            OPT_PLAY_FILE, OPT_RTP_PORT, OPT_ADD_CODEC,
-           OPT_COMPLEXITY, OPT_QUALITY, OPT_PTIME,
+           OPT_COMPLEXITY, OPT_QUALITY, OPT_PTIME, OPT_NO_VAD,
            OPT_NEXT_ACCOUNT, OPT_NEXT_CRED, OPT_MAX_CALLS, 
            OPT_DURATION, OPT_NO_TCP, OPT_NO_UDP,
@@ -290 +290 @@
         { "quality",    1, 0, OPT_QUALITY},
         { "ptime",      1, 0, OPT_PTIME},
+        { "no-vad",     0, 0, OPT_NO_VAD},
         { "next-account",0,0, OPT_NEXT_ACCOUNT},
         { "next-cred",  0, 0, OPT_NEXT_CRED},
@@ -592 +593 @@
             cfg->duration = my_atoi(pj_optarg);
             break;
+        */
 
         case OPT_PTIME:
-            cfg->ptime = my_atoi(pj_optarg);
-            if (cfg->ptime < 10 || cfg->ptime > 1000) {
+            cfg->media_cfg.ptime = my_atoi(pj_optarg);
+            if (cfg->media_cfg.ptime < 10 || cfg->media_cfg.ptime > 1000) {
                 PJ_LOG(1,(THIS_FILE,
                           "Error: invalid --ptime option"));
@@ -602 +604 @@
             break;
 
-        */
+        case OPT_NO_VAD:
+            cfg->media_cfg.no_vad = PJ_TRUE;
+            break;
 
         case OPT_QUALITY:

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2091 +2091 @@
      */
     unsigned            quality;
+
+    /**
+     * Specify default ptime.
+     *
+     * Default: 0 (codec specific)
+     */
+    unsigned            ptime;
+
+    /**
+     * Disable VAD?
+     *
+     * Default: 0 (no (meaning VAD is enabled))
+     */
+    pj_bool_t           no_vad;
 };
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1853 +1853 @@
 
         /* Override ptime, if this option is specified. */
-        PJ_TODO(set_codec_ptime_in_call);
+        if (pjsua_var.media_cfg.ptime != 0) {
+            sess_info.stream_info[0].param->setting.frm_per_pkt = 
+                pjsua_var.media_cfg.ptime / sess_info.stream_info[0].param->info.frm_ptime;
+            if (sess_info.stream_info[0].param->setting.frm_per_pkt == 0)
+                sess_info.stream_info[0].param->setting.frm_per_pkt = 1;
+        }
+
+        /* Disable VAD, if this option is specified. */
+        if (pjsua_var.media_cfg.no_vad) {
+            sess_info.stream_info[0].param->setting.vad = 0;
+        }