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

Timestamp:

Feb 13, 2013 7:43:32 AM (11 years ago)

Author:

nanang

Message:

Re #1568: (PJSIP 2.x) No need to restart media when remote RTP address changed but ICE transport is running.

File:

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

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

@@ -2249 +2249 @@
 #if PJSUA_MEDIA_HAS_PJMEDIA || PJSUA_THIRD_PARTY_STREAM_HAS_GET_INFO
 
+static pj_bool_t is_ice_running(pjmedia_transport *tp)
+{
+    pjmedia_transport_info tpinfo;
+    pjmedia_ice_transport_info *ice_info;
+
+    pjmedia_transport_info_init(&tpinfo);
+    pjmedia_transport_get_info(tp, &tpinfo);
+    ice_info = (pjmedia_ice_transport_info*)
+               pjmedia_transport_info_get_spc_info(&tpinfo,
+                                                   PJMEDIA_TRANSPORT_TYPE_ICE);
+    return (ice_info && ice_info->sess_state == PJ_ICE_STRANS_STATE_RUNNING);
+}
+
+
 static pj_bool_t is_media_changed(const pjsua_call *call,
                                   unsigned med_idx,
@@ -2288 +2302 @@
         }
 
-        /* Compare remote RTP address */
-        if (pj_sockaddr_cmp(&old_si->rem_addr, &new_si->rem_addr))
+        /* Compare remote RTP address. If ICE is running, change in default
+         * address can happen after negotiation, this can be handled
+         * internally by ICE and does not need to cause media restart.
+         */
+        if (!is_ice_running(call_med->tp) &&
+            pj_sockaddr_cmp(&old_si->rem_addr, &new_si->rem_addr))
+        {
             return PJ_TRUE;
+        }
 
         /* Compare codec info */
@@ -2344 +2364 @@
         }
 
-        /* Compare remote RTP address */
-        if (pj_sockaddr_cmp(&old_si->rem_addr, &new_si->rem_addr))
+        /* Compare remote RTP address. If ICE is running, change in default
+         * address can happen after negotiation, this can be handled
+         * internally by ICE and does not need to cause media restart.
+         */
+        if (!is_ice_running(call_med->tp) &&
+            pj_sockaddr_cmp(&old_si->rem_addr, &new_si->rem_addr))
+        {
             return PJ_TRUE;
+        }
 
         /* Compare codec info */
@@ -2555 +2581 @@
             } else {
                 pjmedia_transport_info tp_info;
+                pjmedia_srtp_info *srtp_info;
 
                 /* Start/restart media transport based on info in SDP */
@@ -2573 +2600 @@
                 pjmedia_transport_info_init(&tp_info);
                 pjmedia_transport_get_info(call_med->tp, &tp_info);
-                if (tp_info.specific_info_cnt > 0) {
-                    unsigned i;
-                    for (i = 0; i < tp_info.specific_info_cnt; ++i) {
-                        if (tp_info.spc_info[i].type == 
-                            PJMEDIA_TRANSPORT_TYPE_SRTP)
-                        {
-                            pjmedia_srtp_info *srtp_info =
-                                (pjmedia_srtp_info*)tp_info.spc_info[i].buffer;
-
-                            call_med->rem_srtp_use = srtp_info->peer_use;
-                            break;
-                        }
-                    }
+                srtp_info = (pjmedia_srtp_info*)
+                            pjmedia_transport_info_get_spc_info(
+                                    &tp_info, PJMEDIA_TRANSPORT_TYPE_SRTP);
+                if (srtp_info) {
+                    call_med->rem_srtp_use = srtp_info->peer_use;
                 }
 
@@ -2692 +2711 @@
             } else {
                 pjmedia_transport_info tp_info;
+                pjmedia_srtp_info *srtp_info;
 
                 /* Start/restart media transport */
@@ -2710 +2730 @@
                 pjmedia_transport_info_init(&tp_info);
                 pjmedia_transport_get_info(call_med->tp, &tp_info);
-                if (tp_info.specific_info_cnt > 0) {
-                    unsigned i;
-                    for (i = 0; i < tp_info.specific_info_cnt; ++i) {
-                        if (tp_info.spc_info[i].type ==
-                                PJMEDIA_TRANSPORT_TYPE_SRTP)
-                        {
-                            pjmedia_srtp_info *sri;
-                            sri=(pjmedia_srtp_info*)tp_info.spc_info[i].buffer;
-                            call_med->rem_srtp_use = sri->peer_use;
-                            break;
-                        }
-                    }
+                srtp_info = (pjmedia_srtp_info*)
+                            pjmedia_transport_info_get_spc_info(
+                                    &tp_info, PJMEDIA_TRANSPORT_TYPE_SRTP);
+                if (srtp_info) {
+                    call_med->rem_srtp_use = srtp_info->peer_use;
                 }