Changeset 5788 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_config.c

Timestamp:

May 9, 2018 6:58:48 AM (5 years ago)

Author:

ming

Message:

Fixed #2087: Support for RTP and RTCP multiplexing

File:

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

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

@@ -192 +192 @@
     puts  ("  --turn-user         TURN username");
     puts  ("  --turn-passwd       TURN password");
+    puts  ("  --rtcp-mux          Enable RTP & RTCP multiplexing (default: no)");
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     puts  ("  --srtp-keying       SRTP keying method for outgoing SDP offer.");
@@ -360 +361 @@
            OPT_USE_ICE, OPT_ICE_REGULAR, OPT_USE_SRTP, OPT_SRTP_SECURE,
            OPT_USE_TURN, OPT_ICE_MAX_HOSTS, OPT_ICE_NO_RTCP, OPT_TURN_SRV,
-           OPT_TURN_TCP, OPT_TURN_USER, OPT_TURN_PASSWD, OPT_SRTP_KEYING,
+           OPT_TURN_TCP, OPT_TURN_USER, OPT_TURN_PASSWD, OPT_RTCP_MUX,
+           OPT_SRTP_KEYING,
            OPT_PLAY_FILE, OPT_PLAY_TONE, OPT_RTP_PORT, OPT_ADD_CODEC,
            OPT_ILBC_MODE, OPT_REC_FILE, OPT_AUTO_REC,
@@ -453 +455 @@
         { "turn-user",  1, 0, OPT_TURN_USER},
         { "turn-passwd",1, 0, OPT_TURN_PASSWD},
+        { "rtcp-mux",   0, 0, OPT_RTCP_MUX},
 
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
@@ -1022 +1025 @@
             break;
 
+        case OPT_RTCP_MUX:
+            cur_acc->enable_rtcp_mux = PJ_TRUE;
+            break;
+
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
         case OPT_USE_SRTP:
@@ -1761 +1768 @@
         pj_strcat2(result, line);
     }
+
+    if (acc_cfg->enable_rtcp_mux)
+        pj_strcat2(result, "--rtcp-mux\n");
 }