Changeset 5878

Timestamp:

Sep 4, 2018 3:12:58 PM (6 years ago)

Author:

riza

Message:

Close #2145: Don't rearrange media when sending re-INVITE with
PJSUA_CALL_REINIT_MEDIA.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua2/config.hpp (modified) (1 diff)
• src/pjsua-lib/pjsua_media.c (modified) (6 diffs)
• src/pjsua2/call.cpp (modified) (6 diffs)
• src/pjsua2/endpoint.cpp (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsua2/config.hpp

@@ -40 +40 @@
 #endif
 
+/**
+ * Maximum buffer length to print SDP content for SdpSession. Set this to 0
+ * if the printed SDP is not needed.
+ */
+#ifndef PJSUA2_MAX_SDP_BUF_LEN
+#   define PJSUA2_MAX_SDP_BUF_LEN               1024
+#endif
 
 /**

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

@@ -1359 +1359 @@
  */
 static void sort_media2(const pjsua_call_media *call_med,
+                        pj_bool_t check_tp,
                         unsigned call_med_cnt,
                         pjmedia_type type,
@@ -1387 +1388 @@
 
         /* Is it active? */
-        if (!call_med[i].tp) {
+        if (check_tp && !call_med[i].tp) {
             score[i] -= 10;
         }
@@ -2047 +2048 @@
          * Otherwise, apply media count from the call setting directly.
          */
-        if (reinit && (call->opt.flag & PJSUA_CALL_REINIT_MEDIA) == 0) {
+        if (reinit) {
+            pj_bool_t sort_check_tp;
+
+            /* Media sorting below will check transport, i.e: media without
+             * transport will have lower priority. If PJSUA_CALL_REINIT_MEDIA
+             * is set, we must not check transport.
+             */
+            sort_check_tp = !(call->opt.flag & PJSUA_CALL_REINIT_MEDIA);
 
             /* We are sending reoffer, check media count for each media type
              * from the existing call media list.
              */
-            sort_media2(call->media_prov, call->med_prov_cnt,
+            sort_media2(call->media_prov, sort_check_tp, call->med_prov_cnt,
                         PJMEDIA_TYPE_AUDIO, maudidx, &maudcnt, &mtotaudcnt);
 
@@ -2058 +2066 @@
             //pj_assert(maudcnt > 0);
 
-            sort_media2(call->media_prov, call->med_prov_cnt,
+            sort_media2(call->media_prov, sort_check_tp, call->med_prov_cnt,
                         PJMEDIA_TYPE_VIDEO, mvididx, &mvidcnt, &mtotvidcnt);
 
@@ -2088 +2096 @@
             }
             mvidcnt = call->opt.vid_cnt;
+
+            /* In case of media reinit, 'med_prov_cnt' may be decreased
+             * because the new call->opt says so. As media count should
+             * never decrease, we should verify 'med_prov_cnt' to be
+             * at least equal to 'med_cnt' (see also #1987).
+             */
+            if ((call->opt.flag & PJSUA_CALL_REINIT_MEDIA) &&
+                call->med_prov_cnt < call->med_cnt)
+            {
+                call->med_prov_cnt = call->med_cnt;
+            }
 
         } else {
@@ -2113 +2132 @@
                 }
 #endif
-            }
-
-            /* In case of media reinit, 'med_prov_cnt' may be decreased
-             * because the new call->opt says so. As media count should
-             * never decrease, we should verify 'med_prov_cnt' to be
-             * at least equal to 'med_cnt' (see also #1987).
-             */
-            if (reinit && (call->opt.flag & PJSUA_CALL_REINIT_MEDIA) &&
-                call->med_prov_cnt < call->med_cnt)
-            {
-                call->med_prov_cnt = call->med_cnt;
             }
         }

pjproject/trunk/pjsip/src/pjsua2/call.cpp

@@ -30 +30 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-#define SDP_BUFFER_SIZE 1024
 
 MathStat::MathStat()
@@ -111 +110 @@
 void SdpSession::fromPj(const pjmedia_sdp_session &sdp)
 {
-    char buf[SDP_BUFFER_SIZE];
+#if PJSUA2_MAX_SDP_BUF_LEN
+    char buf[PJSUA2_MAX_SDP_BUF_LEN];
     int len;
 
     len = pjmedia_sdp_print(&sdp, buf, sizeof(buf));
     wholeSdp = (len > -1? string(buf, len): "");
+#else
+    wholeSdp = "";
+#endif    
     pjSdpSession = (void *)&sdp;
 }
@@ -168 +171 @@
      */
     void setPortId(int id);
+
+    /**
+     * Destructor
+     */
+    virtual ~CallAudioMedia();
 };
 
@@ -174 +182 @@
 {
     this->id = pid;
+}
+
+CallAudioMedia::~CallAudioMedia()
+{
+    id = PJSUA_INVALID_ID;
 }
 
@@ -419 +432 @@
     p_reason = (reason.slen == 0? NULL: &reason);
 
-    if (sdp_str == "") {
-        sdp = NULL;
-    } else {
+    sdp = NULL;
+    if (sdp_str != "") {
         pj_str_t dup_pj_sdp;
         pj_str_t pj_sdp_str = {(char*)sdp_str.c_str(),
                                (pj_ssize_t)sdp_str.size()};
+        pj_status_t status;
 
         pj_strdup(pool, &dup_pj_sdp, &pj_sdp_str);        
-        pjmedia_sdp_parse(pool, dup_pj_sdp.ptr,
-                          dup_pj_sdp.slen, &sdp);
+        status = pjmedia_sdp_parse(pool, dup_pj_sdp.ptr,
+                                   dup_pj_sdp.slen, &sdp);
+        if (status != PJ_SUCCESS) {
+            PJ_PERROR(4,(THIS_FILE, status,
+                         "Failed to parse SDP for call param"));
+        }
     }
 }
@@ -753 +770 @@
     
     if (pjsua_call_get_info(id, &pj_ci) == PJ_SUCCESS) {
+        if (medias.size()) {
+            /* Clear medias. */
+            for (mi = 0; mi < medias.size(); mi++) {
+                if (medias[mi])
+                    delete medias[mi];
+            }
+            medias.clear();     
+        }
+
         for (mi = 0; mi < pj_ci.media_cnt; mi++) {
             if (mi >= medias.size()) {

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -1076 +1076 @@
         pj_str_t new_sdp_str = {(char*)prm.sdp.wholeSdp.c_str(),
                                 (pj_ssize_t)prm.sdp.wholeSdp.size()};
+        pj_status_t status;
 
         pj_strdup(pool, &dup_new_sdp, &new_sdp_str);        
-        pjmedia_sdp_parse(pool, dup_new_sdp.ptr,
-                          dup_new_sdp.slen, &new_sdp);
-        pj_memcpy(sdp, new_sdp, sizeof(*sdp));
+        status = pjmedia_sdp_parse(pool, dup_new_sdp.ptr,
+                                   dup_new_sdp.slen, &new_sdp);
+        if (status != PJ_SUCCESS) {
+            PJ_PERROR(4,(THIS_FILE, status,
+                         "Failed to parse the modified SDP"));
+        } else {
+            pj_memcpy(sdp, new_sdp, sizeof(*sdp));
+        }
     }
 }