Changeset 637 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Jul 31, 2006 3:19:36 PM (18 years ago)

Author:

bennylp

Message:

• Added iLBC codec (experimental) with the following features:
  • configurable default decoder mode (20 or 30),
  • encoder mode follows the mode specified in SDP fmtp from the remote's SDP,
  • silence detector uses pjmedia's,
  • PLC uses iLBC's PLC,
  • perceptual enhancement (penh) is configurable via codec param, as usual.

• iLBC mode is configurable in pjsua with --ilbc-mode option.

• Added packet lost simulation in pjmedia's UDP transport and in pjsua (with --rx-drop-pct and --tx-drop-pct options).

• Increase default buffer count in DirectSound? to 32 frames to make it more resilient to CPU disruption.

• Specify and parse fmtp mode in SDP for codecs that need it.

File:

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

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

@@ -124 +124 @@
     puts  ("  --auto-loop         Automatically loop incoming RTP to outgoing RTP");
     puts  ("  --rtp-port=N        Base port to try for RTP (default=4000)");
-    puts  ("  --quality=N         Specify media quality (0-10, default=10)");
+    puts  ("  --quality=N         Specify media quality (0-10, default=6)");
     puts  ("  --ptime=MSEC        Override codec ptime to MSEC (default=specific)");
     puts  ("  --no-vad            Disable VAD/silence detector (default=vad enabled)");
+    puts  ("  --ilbc-mode=MODE    Set iLBC codec mode (20 or 30, default is 20)");
+    puts  ("  --rx-drop-pct=PCT   Drop PCT percent of RX RTP (for pkt lost sim, default: 0)");
+    puts  ("  --tx-drop-pct=PCT   Drop PCT percent of TX RTP (for pkt lost sim, default: 0)");
+
 
     puts  ("");
@@ -256 +260 @@
            OPT_AUTO_ANSWER, OPT_AUTO_HANGUP, OPT_AUTO_PLAY, OPT_AUTO_LOOP,
            OPT_AUTO_CONF, OPT_CLOCK_RATE,
-           OPT_PLAY_FILE, OPT_RTP_PORT, OPT_ADD_CODEC,
+           OPT_PLAY_FILE, OPT_RTP_PORT, OPT_ADD_CODEC, OPT_ILBC_MODE,
            OPT_COMPLEXITY, OPT_QUALITY, OPT_PTIME, OPT_NO_VAD,
+           OPT_RX_DROP_PCT, OPT_TX_DROP_PCT,
            OPT_NEXT_ACCOUNT, OPT_NEXT_CRED, OPT_MAX_CALLS, 
            OPT_DURATION, OPT_NO_TCP, OPT_NO_UDP,
@@ -299 +304 @@
         { "ptime",      1, 0, OPT_PTIME},
         { "no-vad",     0, 0, OPT_NO_VAD},
+        { "ilbc-mode",  1, 0, OPT_ILBC_MODE},
+        { "rx-drop-pct",1, 0, OPT_RX_DROP_PCT},
+        { "tx-drop-pct",1, 0, OPT_TX_DROP_PCT},
         { "next-account",0,0, OPT_NEXT_ACCOUNT},
         { "next-cred",  0, 0, OPT_NEXT_CRED},
@@ -621 +629 @@
                 PJ_LOG(1,(THIS_FILE,
                           "Error: invalid --quality (expecting 0-10"));
+                return -1;
+            }
+            break;
+
+        case OPT_ILBC_MODE:
+            cfg->media_cfg.ilbc_mode = my_atoi(pj_optarg);
+            if (cfg->media_cfg.ilbc_mode!=20 && cfg->media_cfg.ilbc_mode!=30) {
+                PJ_LOG(1,(THIS_FILE,
+                          "Error: invalid --ilbc-mode (expecting 20 or 30"));
+                return -1;
+            }
+            break;
+
+        case OPT_RX_DROP_PCT:
+            cfg->media_cfg.rx_drop_pct = my_atoi(pj_optarg);
+            if (cfg->media_cfg.rx_drop_pct > 100) {
+                PJ_LOG(1,(THIS_FILE,
+                          "Error: invalid --rx-drop-pct (expecting <= 100"));
+                return -1;
+            }
+            break;
+            
+        case OPT_TX_DROP_PCT:
+            cfg->media_cfg.tx_drop_pct = my_atoi(pj_optarg);
+            if (cfg->media_cfg.tx_drop_pct > 100) {
+                PJ_LOG(1,(THIS_FILE,
+                          "Error: invalid --tx-drop-pct (expecting <= 100"));
                 return -1;
             }