Changeset 5788 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

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

Author:

ming

Message:

Fixed #2087: Support for RTP and RTCP multiplexing

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (9 diffs)

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

@@ -579 +579 @@
     pj_sockaddr_cp(&skinfo->rtcp_addr_name, &mapped_addr[1]);
 
-    PJ_LOG(4,(THIS_FILE, "RTP socket reachable at %s",
+    PJ_LOG(4,(THIS_FILE, "RTP%s socket reachable at %s",
+              (call_med->enable_rtcp_mux? " & RTCP": ""),
               pj_sockaddr_print(&skinfo->rtp_addr_name, addr_buf,
                                 sizeof(addr_buf), 3)));
@@ -1832 +1833 @@
 
             if (call_med->tp) {
+                unsigned options = (call_med->enable_rtcp_mux?
+                                    PJMEDIA_TPMED_RTCP_MUX: 0);
                 status = pjmedia_transport_media_create(
                              call_med->tp, tmp_pool,
-                             0, call->async_call.rem_sdp, mi);
+                             options, call->async_call.rem_sdp, mi);
             }
             if (status != PJ_SUCCESS) {
@@ -2154 +2157 @@
 
         if (enabled) {
+            call_med->enable_rtcp_mux = acc->cfg.enable_rtcp_mux;
+
             status = pjsua_call_media_init(call_med, media_type,
                                            &acc->cfg.rtp_cfg,
@@ -2790 +2795 @@
          * internally by ICE and does not need to cause media restart.
          */
+        if (old_si->rtcp_mux != new_si->rtcp_mux)
+            return PJ_TRUE;
         if (!is_ice_running(call_med->tp) &&
             pj_sockaddr_cmp(&old_si->rem_addr, &new_si->rem_addr))
@@ -2852 +2859 @@
          * internally by ICE and does not need to cause media restart.
          */
+        if (old_si->rtcp_mux != new_si->rtcp_mux)
+            return PJ_TRUE;
         if (!is_ice_running(call_med->tp) &&
             pj_sockaddr_cmp(&old_si->rem_addr, &new_si->rem_addr))
@@ -3027 +3036 @@
                              call_id, mi));
                 goto on_check_med_status;
+            }
+
+            /* Check if remote wants RTP and RTCP multiplexing,
+             * but we don't enable it.
+             */
+            if (si->rtcp_mux && !call_med->enable_rtcp_mux) {
+                si->rtcp_mux = PJ_FALSE;
             }
 
@@ -3071 +3087 @@
 
                 if (call->inv->following_fork) {
+                    unsigned options = (call_med->enable_rtcp_mux?
+                                        PJMEDIA_TPMED_RTCP_MUX: 0);
                     /* Normally media transport will automatically restart
                      * itself (if needed, based on info from the SDP) in
@@ -3088 +3106 @@
                     status = pjmedia_transport_media_create(call_med->tp,
                                                             tmp_pool,
-                                                            0, NULL, mi);
+                                                            options, NULL, mi);
                     if (status != PJ_SUCCESS) {
                         PJ_PERROR(1,(THIS_FILE, status,
@@ -3205 +3223 @@
             }
 
+            /* Check if remote wants RTP and RTCP multiplexing,
+             * but we don't enable it.
+             */
+            if (si->rtcp_mux && !call_med->enable_rtcp_mux) {
+                si->rtcp_mux = PJ_FALSE;
+            }
+
             /* Check if this media is changed */
             stream_info.type = PJMEDIA_TYPE_VIDEO;