Changeset 5124 for pjproject/trunk

Timestamp:

Jul 1, 2015 4:46:26 AM (9 years ago)

Author:

ming

Message:

Fixed #1864: Assertion in PJSIP when remote remove and add back media lines in the SDP

Thanks to Brian Walker for the report and patch testing.

File:

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

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

@@ -29 +29 @@
 #   define PJSUA_REQUIRE_CONSECUTIVE_RTCP_PORT  0
 #endif
+
+static void stop_media_stream(pjsua_call *call, unsigned med_idx);
 
 static void pjsua_media_config_dup(pj_pool_t *pool,
@@ -1525 +1527 @@
 
 
-/* Clean up media transports in provisional media that is not used
- * by call media.
+/* If idx == 0, clean up media transports in provisional media that
+ * is not used by call media, else clean up media transports starting
+ * from index idx that have been removed by remote.
  */
 static void media_prov_clean_up(pjsua_call_id call_id, int idx)
@@ -1533 +1536 @@
     unsigned i;
 
-    if (call->med_prov_cnt > call->med_cnt) {
+    if (idx > 0 || call->med_prov_cnt > call->med_cnt) {
         PJ_LOG(4,(THIS_FILE, "Call %d: cleaning up provisional media, "
                              "prov_med_cnt=%d, med_cnt=%d",
-                             call_id, call->med_prov_cnt, call->med_cnt));
+                             call_id, (idx == 0? call->med_prov_cnt: idx),
+                             call->med_cnt));
     }
 
@@ -1548 +1552 @@
 
         for (j = 0; j < call->med_cnt; ++j) {
-            if (call->media[j].tp == call_med->tp) {
+            if (idx == 0 && call->media[j].tp == call_med->tp) {
                 used = PJ_TRUE;
                 break;
@@ -1986 +1990 @@
         if (rem_sdp && mi >= rem_sdp->media_count) {
             /* Remote might have removed some media lines. */
+            for (i = rem_sdp->media_count; i < call->med_prov_cnt; ++i) {
+                stop_media_stream(call, i);
+            }
             media_prov_clean_up(call->index, rem_sdp->media_count);
             call->med_prov_cnt = rem_sdp->media_count;