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

Timestamp:

Oct 3, 2011 8:22:48 AM (13 years ago)

Author:

ming

Message:

Re #1266: Modified pjsua_media_channel_deinit() to resume deinit in the callback (instead of returning PJ_EBUSY) and make sure the right transport is used before calling dlg_respond()

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

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

@@ -2114 +2114 @@
     unsigned mi;
 
+    PJSUA_LOCK();
     for (mi=0; mi<call->med_cnt; ++mi) {
         pjsua_call_media *call_med = &call->media[mi];
 
-        if (call_med->tp_st == PJSUA_MED_TP_CREATING)
-            return PJ_EBUSY;
-    }
+        if (call_med->tp_st == PJSUA_MED_TP_CREATING) {
+            /* We will do the deinitialization after media transport
+             * creation is completed.
+             */
+            call->async_call.med_ch_deinit = PJ_TRUE;
+            PJSUA_UNLOCK();
+            return PJ_SUCCESS;
+        }
+    }
+    PJSUA_UNLOCK();
 
     PJ_LOG(4,(THIS_FILE, "Call %d: deinitializing media..", call_id));