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

Timestamp:

Oct 17, 2018 4:38:39 AM (6 years ago)

Author:

nanang

Message:

Close #2158:

• Added OnCallTransferRequestParam?.newCall to allow application to instantiate a new Call for the new outgoing call in transfer scenario.
• Also added OnCallReplacedParam?.newCall mainly for informational purpose (that app should instantiate new Call for replace scenario).

File:

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

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

@@ -450 +450 @@
 
 Call::Call(Account& account, int call_id)
-: acc(account), id(call_id)
+: acc(account), id(call_id), userData(NULL), sdp_pool(NULL), child(NULL)
 {
     if (call_id != PJSUA_INVALID_ID)
@@ -503 +503 @@
 {
     Call *call = (Call*)pjsua_call_get_user_data(call_id);
-    if (call)
-        call->id = call_id;
+    if (call && call_id != call->id) {
+        if (call->child && call->child->id == PJSUA_INVALID_ID) {
+            /* This must be a new call from call transfer */
+            call = call->child;
+            pjsua_call_set_user_data(call_id, call);
+        }
+        call->id = call_id;
+    }
     return call;
 }
@@ -821 +827 @@
         }
         medias.clear();
+
+        /* Remove this Call object association */
+        pjsua_call_set_user_data(id, NULL);
     }