Changeset 4071 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Apr 24, 2012 5:40:32 AM (12 years ago)

Author:

nanang

Message:

Fix #1423:

• Added provisional media in call for generating initial and subsequent SDP offer/answer. If a reoffer is rejected by peer, the main call media will remain unchanged and the provisional media will be cleaned up (the cleanup is currently delayed until call gets destroyed or another reoffer/answer occurs).
• Reenabled media transport dump in pjsua_core.c.

File:

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

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

@@ -545 +545 @@
         call->opt = *opt;
 
-        /* Reinit media channel when media count is changed */
-        if (opt->aud_cnt != old_opt.aud_cnt ||
-            opt->vid_cnt != old_opt.vid_cnt)
+        /* Reinit media channel when media count is changed or we are the
+         * answerer (as remote offer may 'extremely' modify the existing
+         * media session, e.g: media type order).
+         */
+        if (rem_sdp ||
+            opt->aud_cnt!=old_opt.aud_cnt || opt->vid_cnt!=old_opt.vid_cnt)
         {
             pjsip_role_e role = rem_sdp? PJSIP_ROLE_UAS : PJSIP_ROLE_UAC;
@@ -1199 +1202 @@
         pjsip_dlg_terminate(dlg);
          */
-        pjsua_media_channel_deinit(call->index);
         goto on_return;
     }
@@ -1318 +1320 @@
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Unable to send 100 response", status);
+            pjsua_media_channel_deinit(call->index);
             goto on_return;
         }
@@ -3225 +3228 @@
         pjsua_perror(THIS_FILE, "SDP negotiation has failed", status);
 
+        /* Clean up provisional media */
+        pjsua_media_prov_clean_up(call->index);
+
         /* Do not deinitialize media since this may be a re-INVITE or
          * UPDATE (which in this case the media should not get affected
@@ -3428 +3434 @@
         call->opt = opt;
     }
-
+    
     /* Re-init media for the new remote offer before creating SDP */
-    status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAS,
-                                      call->secure_level,
-                                      call->inv->pool_prov,
-                                      offer, NULL,
-                                      PJ_FALSE, NULL);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Error re-initializing media channel", status);
-        goto on_return;
-    }
+    status = apply_call_setting(call, &call->opt, offer);
+    if (status != PJ_SUCCESS)
+        goto on_return;
 
     status = pjsua_media_channel_create_sdp(call->index,