Changeset 4458 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Apr 3, 2013 10:04:18 AM (12 years ago)

Author:

nanang

Message:

Fix #1811: Set SDP direction attribute to "sendonly" in answering call unhold request after double holds to maintain the local hold status.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (4 diffs)

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

@@ -3754 +3754 @@
 static pj_status_t modify_sdp_of_call_hold(pjsua_call *call,
                                            pj_pool_t *pool,
-                                           pjmedia_sdp_session *sdp)
+                                           pjmedia_sdp_session *sdp,
+                                           pj_bool_t as_answerer)
 {
     unsigned mi;
@@ -3805 +3806 @@
             pjmedia_sdp_media_remove_all_attr(m, "inactive");
 
-            if (call->media[mi].dir & PJMEDIA_DIR_ENCODING) {
+            /* When as answerer, just simply set dir to "sendonly", note that
+             * if the offer uses "sendonly" or "inactive", the SDP negotiator
+             * will change our answer dir to "inactive".
+             */
+            if (as_answerer || (call->media[mi].dir & PJMEDIA_DIR_ENCODING)) {
                 /* Add sendonly attribute */
                 attr = pjmedia_sdp_attr_create(pool, "sendonly", NULL);
@@ -3839 +3844 @@
     }
 
-    status = modify_sdp_of_call_hold(call, pool, sdp);
+    status = modify_sdp_of_call_hold(call, pool, sdp, PJ_FALSE);
     if (status != PJ_SUCCESS)
         return status;
@@ -3929 +3934 @@
     /* Check if call is on-hold */
     if (call->local_hold) {
-        modify_sdp_of_call_hold(call, call->inv->pool_prov, answer);
+        modify_sdp_of_call_hold(call, call->inv->pool_prov, answer, PJ_TRUE);
     }