Changeset 5871 for pjproject

Timestamp:

Aug 31, 2018 3:15:23 AM (6 years ago)

Author:

nanang

Message:

Fix #2144: Updated PJSUA media update to work on call->media directly (previously on call->media_prov). Note that at this point (i.e: after SDP nego), PJSUA won't revert media state (back to before SDP nego) on any media update failure.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

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

@@ -3046 +3046 @@
     }
 
+    /* Update call media from provisional media */
+    call->med_cnt = call->med_prov_cnt;
+    pj_memcpy(call->media, call->media_prov,
+              sizeof(call->media_prov[0]) * call->med_prov_cnt);
+
     /* Process each media stream */
-    for (mi=0; mi < call->med_prov_cnt; ++mi) {
-        pjsua_call_media *call_med = &call->media_prov[mi];
+    for (mi=0; mi < call->med_cnt; ++mi) {
+        pjsua_call_media *call_med = &call->media[mi];
         pj_bool_t media_changed = PJ_FALSE;
 
@@ -3439 +3444 @@
     }
 
-    /* Update call media from provisional media */
-    call->med_cnt = call->med_prov_cnt;
-    pj_memcpy(call->media, call->media_prov,
-              sizeof(call->media_prov[0]) * call->med_prov_cnt);
+    /* Sync provisional media to call media */
+    call->med_prov_cnt = call->med_cnt;
+    pj_memcpy(call->media_prov, call->media,
+              sizeof(call->media[0]) * call->med_cnt);
 
     /* Perform SDP re-negotiation. */