Changeset 3520 for pjproject/branches/projects/2.0-dev

Timestamp:

Apr 11, 2011 5:27:14 PM (14 years ago)

Author:

bennylp

Message:

Re #1185: fixed ICE media transport to work with video in pjsua-lib

Location:

pjproject/branches/projects/2.0-dev

Files:

• pjmedia/include/pjmedia/transport_ice.h (modified) (1 diff)
• pjmedia/src/pjmedia/transport_ice.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/transport_ice.h

@@ -182 +182 @@
                                          pjmedia_transport **p_tp);
 
+/**
+ * The same as #pjmedia_ice_create2() with additional \a user_data param.
+ *
+ * @param endpt         The media endpoint.
+ * @param name          Optional name to identify this ICE media transport
+ *                      for logging purposes.
+ * @param comp_cnt      Number of components to be created.
+ * @param cfg           Pointer to configuration settings.
+ * @param cb            Optional structure containing ICE specific callbacks.
+ * @param options       Options, see #pjmedia_transport_ice_options.
+ * @param user_data     User data to be attached to the transport.
+ * @param p_tp          Pointer to receive the media transport instance.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjmedia_ice_create3(pjmedia_endpt *endpt,
+                                         const char *name,
+                                         unsigned comp_cnt,
+                                         const pj_ice_strans_cfg *cfg,
+                                         const pjmedia_ice_cb *cb,
+                                         unsigned options,
+                                         void *user_data,
+                                         pjmedia_transport **p_tp);
+
 PJ_END_DECL
 

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/transport_ice.c

@@ -205 +205 @@
                                         pjmedia_transport **p_tp)
 {
+    return pjmedia_ice_create3(endpt, name, comp_cnt, cfg, cb,
+                               options, NULL, p_tp);
+}
+
+/*
+ * Create ICE media transport.
+ */
+PJ_DEF(pj_status_t) pjmedia_ice_create3(pjmedia_endpt *endpt,
+                                        const char *name,
+                                        unsigned comp_cnt,
+                                        const pj_ice_strans_cfg *cfg,
+                                        const pjmedia_ice_cb *cb,
+                                        unsigned options,
+                                        void *user_data,
+                                        pjmedia_transport **p_tp)
+{
     pj_pool_t *pool;
     pj_ice_strans_cb ice_st_cb;
@@ -222 +238 @@
     tp_ice->base.op = &transport_ice_op;
     tp_ice->base.type = PJMEDIA_TRANSPORT_TYPE_ICE;
+    tp_ice->base.user_data = user_data;
     tp_ice->initial_sdp = PJ_TRUE;
     tp_ice->oa_role = ROLE_NONE;

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1068 +1068 @@
         ++comp_cnt;
 
-    status = pjmedia_ice_create(pjsua_var.med_endpt, name, comp_cnt,
-                                &ice_cfg, &ice_cb, &call_med->tp);
+    status = pjmedia_ice_create3(pjsua_var.med_endpt, name, comp_cnt,
+                                 &ice_cfg, &ice_cb, 0, call_med,
+                                 &call_med->tp);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create ICE media transport",