Changeset 2262 for pjproject

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

Location:

pjproject/trunk

Files:

• build.symbian/pjmedia.mmp (modified) (1 diff)
• pjmedia/build/Makefile (modified) (1 diff)
• pjmedia/build/pjmedia.dsp (modified) (2 diffs)
• pjmedia/build/pjmedia.vcproj (modified) (2 diffs)
• pjmedia/include/pjmedia.h (modified) (1 diff)
• pjmedia/include/pjmedia/transport.h (modified) (1 diff)
• pjmedia/include/pjmedia/transport_adapter_sample.h (added)
• pjmedia/src/pjmedia/transport_adapter_sample.c (added)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (4 diffs)

pjproject/trunk/build.symbian/pjmedia.mmp

@@ -68 +68 @@
 SOURCE          stream.c
 SOURCE          tonegen.c
+SOURCE          transport_adapter_sample.c
 SOURCE          transport_ice.c
 SOURCE          transport_udp.c

pjproject/trunk/pjmedia/build/Makefile

@@ -58 +58 @@
                         sdp.o sdp_cmp.o sdp_neg.o \
                         session.o silencedet.o sound_port.o stereo_port.o \
-                        stream.o tonegen.o transport_ice.o transport_loop.o \
+                        stream.o tonegen.o transport_adapter_sample.o \
+                        transport_ice.o transport_loop.o \
                         transport_srtp.o transport_udp.o \
                         wav_player.o wav_playlist.o wav_writer.o wave.o \

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -258 +258 @@
 # Begin Source File
 
+SOURCE=..\src\pjmedia\transport_adapter_sample.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjmedia\transport_ice.c
 # End Source File
@@ -439 +443 @@
 
 SOURCE=..\include\pjmedia\transport.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\transport_adapter_sample.h
 # End Source File
 # Begin Source File

pjproject/trunk/pjmedia/build/pjmedia.vcproj

@@ -971 +971 @@
                         </File>
                         <File
+                                RelativePath="..\src\pjmedia\transport_adapter_sample.c"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\pjmedia\transport_ice.c"
                                 >
@@ -1246 +1250 @@
                         </File>
                         <File
+                                RelativePath="..\include\pjmedia\transport_adapter_sample.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\include\pjmedia\transport_ice.h"
                                 >

pjproject/trunk/pjmedia/include/pjmedia.h

@@ -59 +59 @@
 #include <pjmedia/tonegen.h>
 #include <pjmedia/transport.h>
+#include <pjmedia/transport_adapter_sample.h>
 #include <pjmedia/transport_ice.h>
 #include <pjmedia/transport_loop.h>

pjproject/trunk/pjmedia/include/pjmedia/transport.h

@@ -428 +428 @@
      * transport.
      */
-    PJMEDIA_TRANSPORT_TYPE_SRTP
+    PJMEDIA_TRANSPORT_TYPE_SRTP,
+
+    /**
+     * Start of user defined transport.
+     */
+    PJMEDIA_TRANSPORT_TYPE_USER
 
 } pjmedia_transport_type;

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -24 +24 @@
 
 //#define STEREO_DEMO
+//#define TRANSPORT_ADAPTER_SAMPLE
 
 /* Ringtones                US         UK  */
@@ -132 +133 @@
 #ifdef STEREO_DEMO
 static void stereo_demo();
+#endif
+#ifdef TRANSPORT_ADAPTER_SAMPLE
+static pj_status_t transport_adapter_sample(void);
 #endif
 pj_status_t app_destroy(void);
@@ -4207 +4211 @@
 
     /* Add RTP transports */
+#ifdef TRANSPORT_ADAPTER_SAMPLE
+    status = transport_adapter_sample();
+
+#else
     status = pjsua_media_transports_create(&app_config.rtp_cfg);
+#endif
     if (status != PJ_SUCCESS)
         goto on_error;
@@ -4392 +4401 @@
 #endif
 
+#ifdef TRANSPORT_ADAPTER_SAMPLE
+static pj_status_t create_transport_adapter(pjmedia_endpt *med_endpt, int port,
+                                            pjmedia_transport **p_tp)
+{
+    pjmedia_transport *udp;
+    pj_status_t status;
+
+    /* Create the UDP media transport */
+    status = pjmedia_transport_udp_create(med_endpt, NULL, port, 0, &udp);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* Create the adapter */
+    status = pjmedia_tp_adapter_create(med_endpt, NULL, udp, p_tp);
+    if (status != PJ_SUCCESS) {
+        pjmedia_transport_close(udp);
+        return status;
+    }
+
+    return PJ_SUCCESS;
+}
+
+static pj_status_t transport_adapter_sample(void)
+{
+    pjsua_media_transport tp[PJSUA_MAX_CALLS];
+    pj_status_t status;
+    int port = 7000;
+    unsigned i;
+
+    for (i=0; i<app_config.cfg.max_calls; ++i) {
+        status = create_transport_adapter(pjsua_get_pjmedia_endpt(), 
+                                          port + i*10,
+                                          &tp[i].transport);
+        if (status != PJ_SUCCESS)
+            return status;
+    }
+
+    return pjsua_media_transports_attach(tp, i, PJ_TRUE);
+}
+#endif
+

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -80 +80 @@
     pj_status_t          med_tp_ready;/**< Media transport status.          */
     pjmedia_transport   *med_orig;  /**< Original media transport           */
+    pj_bool_t            med_tp_auto_del; /**< May delete media transport   */
     pjsua_med_tp_st      med_tp_st; /**< Media transport state              */
     pj_timer_entry       refresh_tm;/**< Timer to send re-INVITE.           */

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;
 }