Changeset 4071 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.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_vid.c (modified) (4 diffs)

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

@@ -1533 +1533 @@
     sdp = pjmedia_sdp_session_clone(call->inv->pool_prov, current_sdp);
 
+    /* Clean up provisional media before using it */
+    pjsua_media_prov_clean_up(call->index);
+
+    /* Update provisional media from call media */
+    call->med_prov_cnt = call->med_cnt;
+    pj_memcpy(call->media_prov, call->media,
+              sizeof(call->media[0]) * call->med_cnt);
+
     /* Initialize call media */
-    call_med = &call->media[call->med_cnt++];
-
+    call_med = &call->media_prov[call->med_prov_cnt++];
     status = pjsua_call_media_init(call_med, PJMEDIA_TYPE_VIDEO,
                                    &acc_cfg->rtp_cfg, call->secure_level,
@@ -1598 +1605 @@
 on_error:
     if (call_med->tp) {
+        pjsua_set_media_tp_state(call_med, PJSUA_MED_TP_NULL);
         pjmedia_transport_close(call_med->tp);
         call_med->tp = call_med->tp_orig = NULL;
@@ -1630 +1638 @@
     }
 
-    call_med = &call->media[med_idx];
+    /* Clean up provisional media before using it */
+    pjsua_media_prov_clean_up(call->index);
+
+    /* Update provisional media from call media */
+    call->med_prov_cnt = call->med_cnt;
+    pj_memcpy(call->media_prov, call->media,
+              sizeof(call->media[0]) * call->med_cnt);
+
+    call_med = &call->media_prov[med_idx];
 
     /* Verify if the stream media type is video */
@@ -1736 +1752 @@
 on_error:
         if (status != PJ_SUCCESS) {
+            pjsua_media_prov_clean_up(call->index);
             return status;
         }