Changeset 5094 for pjproject

Timestamp:

May 15, 2015 6:20:02 AM (9 years ago)

Author:

ming

Message:

Fixed #1848: SDP failed to be created when provisional media has been cleared

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

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

@@ -2414 +2414 @@
     }
 
+    /* We may need to re-initialize media before creating SDP */
+    if (call->med_prov_cnt == 0) {
+        status = apply_call_setting(call, &call->opt, NULL);
+        if (status != PJ_SUCCESS)
+            goto on_return;
+    }
+
     status = create_sdp_of_call_hold(call, &sdp);
     if (status != PJ_SUCCESS)
@@ -4157 +4164 @@
 #endif
 
+    /* We may need to re-initialize media before creating SDP */
+    if (call->med_prov_cnt == 0) {
+        status = apply_call_setting(call, &call->opt, NULL);
+        if (status != PJ_SUCCESS)
+            goto on_return;
+    }
+
     /* See if we've put call on hold. */
     if (call->local_hold) {
@@ -4166 +4180 @@
         PJ_LOG(4,(THIS_FILE, "Call %d: asked to send a new offer",
                   call->index));
-
-        if (call->med_prov_cnt == 0) {
-            status = pjsua_media_channel_init(call->index, inv->role, 
-                                             call->secure_level, inv->pool_prov, 
-                                             NULL, NULL, PJ_FALSE, NULL);
-            if (status != PJ_SUCCESS) {     
-                pjsua_perror(THIS_FILE, "Unable to create offer", status);
-                goto on_return;
-            }
-        }
 
         status = pjsua_media_channel_create_sdp(call->index,