Changeset 3585 for pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Jun 16, 2011 5:10:45 AM (13 years ago)

Author:

ming

Message:

Closed #1173: PJSUA callback to allow creation of custom media transports by application

File:

• pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_media.c (modified) (5 diffs)

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1175 +1175 @@
     pjsua_call *call = &pjsua_var.calls[call_id];
     pj_status_t status;
+    pj_bool_t use_custom_med_tp = PJ_FALSE;
+    unsigned custom_med_tp_flags = 0;
 
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
@@ -1193 +1195 @@
     }
 
+    if (!call->med_orig &&
+        pjsua_var.ua_cfg.cb.on_create_media_transport)
+    {
+        use_custom_med_tp = PJ_TRUE;
+    }
+
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     /* This function may be called when SRTP transport already exists 
      * (e.g: in re-invite, update), don't need to destroy/re-create.
      */
-    if (!call->med_orig || call->med_tp == call->med_orig) {
+    if (!call->med_orig) {
 
         /* Check if SRTP requires secure signaling */
@@ -1211 +1219 @@
         pjmedia_srtp_setting_default(&srtp_opt);
         srtp_opt.close_member_tp = PJ_FALSE;
+        if (use_custom_med_tp)
+            custom_med_tp_flags |= PJSUA_MED_TP_CLOSE_MEMBER;
         /* If media session has been ever established, let's use remote's 
          * preference in SRTP usage policy, especially when it is stricter.
@@ -1268 +1278 @@
     PJ_LOG(4,(THIS_FILE, "Media index %d selected for call %d",
               call->audio_idx, call->index));
+
+    if (use_custom_med_tp) {
+        /* Use custom media transport returned by the application */
+        call->med_tp = (*pjsua_var.ua_cfg.cb.on_create_media_transport)(
+                           call_id, call->audio_idx, call->med_tp,
+                           custom_med_tp_flags);
+        if (!call->med_tp) {
+            if (sip_err_code) *sip_err_code = PJSIP_SC_NOT_ACCEPTABLE;
+            pjsua_media_channel_deinit(call_id);
+            return PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_NOT_ACCEPTABLE);
+        }
+    }
 
     /* Create the media transport */
@@ -1544 +1566 @@
         pjmedia_transport_close(call->med_tp);
         call->med_tp = call->med_orig;
+        call->med_orig = NULL;
     }