Changeset 438 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_settings.c

Timestamp:

May 13, 2006 10:46:23 PM (18 years ago)

Author:

bennylp

Message:

Another major modifications in PJMEDIA:

• handle multiple frames in one packet
• split stream creation into two steps to allow customization
• PLC framework and implementation with G.711 and speex
• stream returns NO_FRAME correctly.
• added ptime argument in pjsua

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_settings.c (modified) (8 diffs)

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

@@ -95 +95 @@
     puts  ("  --complexity=N      Specify encoding complexity (0-10, default=none(-1))");
     puts  ("  --quality=N         Specify encoding quality (0-10, default=4)");
+    puts  ("  --ptime=MSEC        Override codec ptime to MSEC (default=specific)");
     puts  ("");
     puts  ("Buddy List (can be more than one):");
@@ -228 +229 @@
            OPT_AUTO_CONF, OPT_CLOCK_RATE,
            OPT_PLAY_FILE, OPT_RTP_PORT, OPT_ADD_CODEC,
-           OPT_COMPLEXITY, OPT_QUALITY,
+           OPT_COMPLEXITY, OPT_QUALITY, OPT_PTIME,
            OPT_NEXT_ACCOUNT, OPT_NEXT_CRED, OPT_MAX_CALLS, OPT_UAS_REFRESH,
            OPT_UAS_DURATION,
@@ -267 +268 @@
         { "complexity", 1, 0, OPT_COMPLEXITY},
         { "quality",    1, 0, OPT_QUALITY},
+        { "ptime",      1, 0, OPT_PTIME},
         { "next-account",0,0, OPT_NEXT_ACCOUNT},
         { "next-cred",  0, 0, OPT_NEXT_CRED},
@@ -556 +558 @@
                 PJ_LOG(1,(THIS_FILE,
                           "Error: invalid --quality (expecting 0-10"));
+                return -1;
+            }
+            break;
+
+        case OPT_PTIME:
+            pjsua.ptime = my_atoi(pj_optarg);
+            if (pjsua.ptime < 10 || pjsua.ptime > 1000) {
+                PJ_LOG(1,(THIS_FILE,
+                          "Error: invalid --ptime option"));
                 return -1;
             }
@@ -772 +783 @@
 
         PJ_LOG(3,(THIS_FILE,
-               "                  TX pt=%d, stat last update: %s\n"
+               "                  TX pt=%d, ptime=%dms, stat last update: %s\n"
                "                     total %spkt %sB (%sB +IP hdr)%s\n"
                "                     pkt loss=%d (%3.1f%%), dup=%d (%3.1f%%), reorder=%d (%3.1f%%)%s\n"
@@ -779 +790 @@
                "                     jitter     : %7.3f %7.3f %7.3f %7.3f%s",
                info.stream_info[i].tx_pt,
+               info.stream_info[i].param->info.frm_ptime *
+                info.stream_info[i].param->setting.frm_per_pkt,
                last_update,
                good_number(packets, stat.tx.pkt),
@@ -970 +983 @@
     char line[128];
 
+    PJ_UNUSED_ARG(max);
+
     cfg.ptr = buf;
     cfg.slen = 0;
@@ -1097 +1112 @@
     pj_strcat2(&cfg, line);
 
+    /* ptime */
+    if (pjsua.ptime) {
+        pj_ansi_sprintf(line, "--ptime %d\n",
+                        pjsua.ptime);
+        pj_strcat2(&cfg, line);
+    }
+
     /* Start RTP port. */
     pj_ansi_sprintf(line, "--rtp-port %d\n",