Changeset 1698 for pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Jan 17, 2008 5:29:36 PM (17 years ago)

Author:

nanang

Message:

Ticket #452:

• Add directory srtp to third_party/build directory
• Add libsrtp project & integrate it to pjproject vs8 solution
• Add transport_srtp.h & .c
• Modify project dependencies to include libsrtp
• Modify Samples-vc.mak, add libsrtp as third party library
• Modify transport interface
• Modify transport_ice & transport_udp to accomodate new transport interface
• Modify other files that uses transport

File:

• pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_media.c (modified) (10 diffs)

pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_media.c

@@ -535 +535 @@
             goto on_error;
         }
-        status = pjmedia_transport_udp_attach(pjsua_var.med_endpt, NULL,
-                                              &skinfo, 0,
-                                              &pjsua_var.calls[i].med_tp);
+
+        if (pjsua_var.media_cfg.enable_srtp) {
+            pjmedia_transport *tp;
+            unsigned srtp_options = 
+                                PJMEDIA_SRTP_AUTO_CLOSE_UNDERLYING_TRANSPORT;
+
+            status = pjmedia_transport_udp_attach(pjsua_var.med_endpt, NULL,
+                                                  &skinfo, 0, &tp);
+            status = pjmedia_transport_srtp_create(pjsua_var.med_endpt, tp,
+                                                   srtp_options, 
+                                                   &pjsua_var.calls[i].med_tp);
+        } else {
+            status = pjmedia_transport_udp_attach(pjsua_var.med_endpt, NULL,
+                                                  &skinfo, 0,
+                                                  &pjsua_var.calls[i].med_tp);
+        }
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Unable to create media transport",
@@ -544 +557 @@
         }
 
-        pjmedia_transport_udp_simulate_lost(pjsua_var.calls[i].med_tp,
-                                            PJMEDIA_DIR_ENCODING,
-                                            pjsua_var.media_cfg.tx_drop_pct);
-
-        pjmedia_transport_udp_simulate_lost(pjsua_var.calls[i].med_tp,
-                                            PJMEDIA_DIR_DECODING,
-                                            pjsua_var.media_cfg.rx_drop_pct);
+        pjmedia_transport_simulate_lost(pjsua_var.calls[i].med_tp,
+                                        PJMEDIA_DIR_ENCODING,
+                                        pjsua_var.media_cfg.tx_drop_pct);
+
+        pjmedia_transport_simulate_lost(pjsua_var.calls[i].med_tp,
+                                        PJMEDIA_DIR_DECODING,
+                                        pjsua_var.media_cfg.rx_drop_pct);
 
     }
@@ -646 +659 @@
         }
 
-        pjmedia_ice_simulate_lost(pjsua_var.calls[i].med_tp,
-                                  PJMEDIA_DIR_ENCODING,
-                                  pjsua_var.media_cfg.tx_drop_pct);
-
-        pjmedia_ice_simulate_lost(pjsua_var.calls[i].med_tp,
-                                  PJMEDIA_DIR_DECODING,
-                                  pjsua_var.media_cfg.rx_drop_pct);
+        pjmedia_transport_simulate_lost(pjsua_var.calls[i].med_tp,
+                                        PJMEDIA_DIR_ENCODING,
+                                        pjsua_var.media_cfg.tx_drop_pct);
+
+        pjmedia_transport_simulate_lost(pjsua_var.calls[i].med_tp,
+                                        PJMEDIA_DIR_DECODING,
+                                        pjsua_var.media_cfg.rx_drop_pct);
 
         status = pjmedia_ice_start_init(pjsua_var.calls[i].med_tp, 0, &addr,
@@ -757 +770 @@
 
         /* Restart ICE */
-        pjmedia_ice_stop_ice(call->med_tp);
+        pjmedia_transport_media_stop(call->med_tp);
 
         status = pjmedia_ice_init_ice(call->med_tp, ice_role, NULL, NULL);
@@ -769 +782 @@
 pj_status_t pjsua_media_channel_create_sdp(pjsua_call_id call_id, 
                                            pj_pool_t *pool,
+                                           const pjmedia_sdp_session *rem_sdp,
                                            pjmedia_sdp_session **p_sdp)
 {
@@ -816 +830 @@
     }
 
-    if (pjsua_var.media_cfg.enable_ice) {
-        status = pjmedia_ice_modify_sdp(call->med_tp, pool, sdp);
+    //if (pjsua_var.media_cfg.enable_ice) {
+        //status = pjmedia_transport_media_create(call->med_tp, pool, sdp, NULL);
+        status = pjmedia_transport_media_create(call->med_tp, pool, 
+                                                sdp, rem_sdp);
         if (status != PJ_SUCCESS)
             goto on_error;
-    }
+    //}
 
     *p_sdp = sdp;
@@ -859 +875 @@
     stop_media_session(call_id);
 
-    if (pjsua_var.media_cfg.enable_ice) {
-        pjmedia_ice_stop_ice(call->med_tp);
-    }
+    //if (pjsua_var.media_cfg.enable_ice) {
+        pjmedia_transport_media_stop(call->med_tp);
+    //}
 
     return PJ_SUCCESS;
@@ -885 +901 @@
 
 pj_status_t pjsua_media_channel_update(pjsua_call_id call_id,
-                                       const pjmedia_sdp_session *local_sdp,
+                                       pjmedia_sdp_session *local_sdp,
                                        const pjmedia_sdp_session *remote_sdp)
 {
@@ -947 +963 @@
 
         /* Shutdown ICE session */
-        if (pjsua_var.media_cfg.enable_ice) {
-            pjmedia_ice_stop_ice(call->med_tp);
-        }
+        //if (pjsua_var.media_cfg.enable_ice) {
+            pjmedia_transport_media_stop(call->med_tp);
+        //}
 
         /* No need because we need keepalive? */
@@ -955 +971 @@
     } else {
         /* Start ICE */
-        if (pjsua_var.media_cfg.enable_ice) {
-            status = pjmedia_ice_start_ice(call->med_tp, call->inv->pool, 
-                                           remote_sdp, 0);
+        //if (pjsua_var.media_cfg.enable_ice) {
+            status = pjmedia_transport_media_start(call->med_tp, 
+                                                   call->inv->pool,
+                                                   local_sdp, remote_sdp, 0);
             if (status != PJ_SUCCESS)
                 return status;
-        }
+        //}
 
         /* Override ptime, if this option is specified. */