Changeset 3796

Timestamp:

Oct 6, 2011 6:49:09 AM (13 years ago)

Author:

ming

Message:

Re #1266:

• Make sure that all media transports are already created and completed to fix the assertion when making call using ICE.

• Change the callback pjsua_med_tp_state_cb to return pj_status_t (instead of void)

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -531 +531 @@
   * @param call_id      The call ID.
   * @param info         The media transport state info.
+  *
+  * @return             The callback must return PJ_SUCCESS at the moment.
   */
-typedef void (*pjsua_med_tp_state_cb)(pjsua_call_id call_id,
-                                      const pjsua_med_tp_state_info *info);
+typedef pj_status_t
+(*pjsua_med_tp_state_cb)(pjsua_call_id call_id,
+                         const pjsua_med_tp_state_info *info);
 
 

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

@@ -631 +631 @@
                                       call->secure_level, dlg->pool,
                                       NULL, NULL, PJ_TRUE,
-                                      (pjsua_med_tp_state_cb)
                                       &on_make_call_med_tp_complete);
     if (status == PJ_SUCCESS) {
@@ -1097 +1096 @@
                                       offer,
                                       &sip_err_code, PJ_TRUE,
-                                      (pjsua_med_tp_state_cb)
                                       &on_incoming_call_med_tp_complete);
     if (status == PJ_SUCCESS) {

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

@@ -1482 +1482 @@
             pjsua_call_media *call_med = &call->media[mi];
 
-            if (call_med->med_init_cb) {
+            if (call_med->med_init_cb ||
+                call_med->tp_st == PJSUA_MED_TP_NULL)
+            {
                 pj_mutex_unlock(call->med_ch_mutex);
                 return PJ_SUCCESS;
@@ -1698 +1700 @@
                                            security_level, sip_err_code,
                                            async,
-                                           (async? (pjsua_med_tp_state_cb)
-                                           &media_channel_init_cb: NULL));
+                                           (async? &media_channel_init_cb:
+                                            NULL));
             if (status == PJ_EPENDING) {
                 pending_med_tp = PJ_TRUE;