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

Timestamp:

Sep 4, 2008 1:55:33 PM (16 years ago)

Author:

bennylp

Message:

Ticket #610: Added sample to create a media transport adapter, similar to how SRTP media transport works

File:

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

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

@@ -544 +544 @@
             pjsua_media_channel_deinit(i);
         }
-        if (pjsua_var.calls[i].med_tp) {
-            (*pjsua_var.calls[i].med_tp->op->destroy)(pjsua_var.calls[i].med_tp);
-            pjsua_var.calls[i].med_tp = NULL;
-        }
+        if (pjsua_var.calls[i].med_tp && pjsua_var.calls[i].med_tp_auto_del) {
+            pjmedia_transport_close(pjsua_var.calls[i].med_tp);
+        }
+        pjsua_var.calls[i].med_tp = NULL;
     }
 
@@ -842 +842 @@
     /* Delete existing media transports */
     for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) {
-        if (pjsua_var.calls[i].med_tp != NULL) {
+        if (pjsua_var.calls[i].med_tp != NULL && 
+            pjsua_var.calls[i].med_tp_auto_del) 
+        {
             pjmedia_transport_close(pjsua_var.calls[i].med_tp);
             pjsua_var.calls[i].med_tp = NULL;
@@ -851 +853 @@
     pjsua_transport_config_dup(pjsua_var.pool, &cfg, app_cfg);
 
+    /* Create the transports */
     if (pjsua_var.media_cfg.enable_ice) {
         status = create_ice_media_transports();
@@ -857 +860 @@
     }
 
+    /* Set media transport auto_delete to True */
+    for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) {
+        pjsua_var.calls[i].med_tp_auto_del = PJ_TRUE;
+    }
 
     PJSUA_UNLOCK();
 
     return status;
+}
+
+/*
+ * Attach application's created media transports.
+ */
+PJ_DEF(pj_status_t) pjsua_media_transports_attach(pjsua_media_transport tp[],
+                                                  unsigned count,
+                                                  pj_bool_t auto_delete)
+{
+    unsigned i;
+
+    PJ_ASSERT_RETURN(tp && count==pjsua_var.ua_cfg.max_calls, PJ_EINVAL);
+
+    /* Assign the media transports */
+    for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) {
+        if (pjsua_var.calls[i].med_tp != NULL && 
+            pjsua_var.calls[i].med_tp_auto_del) 
+        {
+            pjmedia_transport_close(pjsua_var.calls[i].med_tp);
+        }
+
+        pjsua_var.calls[i].med_tp = tp[i].transport;
+        pjsua_var.calls[i].med_tp_auto_del = auto_delete;
+    }
+
+    return PJ_SUCCESS;
 }