Changeset 5878 for pjproject/trunk/pjsip/src/pjsua2/call.cpp

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.

File:

• pjproject/trunk/pjsip/src/pjsua2/call.cpp (modified) (6 diffs)

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()) {