Changeset 5513 for pjproject/branches/projects/uwp/pjsip/src/pjsua2/account.cpp

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua2/account.cpp (modified) (10 diffs)

pjproject/branches/projects/uwp/pjsip/src/pjsua2/account.cpp

@@ -44 +44 @@
     NODE_READ_UNSIGNED  (this_node, unregWaitMsec);
     NODE_READ_UNSIGNED  (this_node, proxyUse);
+    NODE_READ_STRING    (this_node, contactParams);
 
     readSipHeaders(this_node, "headers", headers);
@@ -62 +63 @@
     NODE_WRITE_UNSIGNED (this_node, unregWaitMsec);
     NODE_WRITE_UNSIGNED (this_node, proxyUse);
+    NODE_WRITE_STRING   (this_node, contactParams);
 
     writeSipHeaders(this_node, "headers", headers);
@@ -278 +280 @@
     NODE_READ_NUM_T   ( this_node, pjmedia_vid_stream_rc_method, rateControlMethod);
     NODE_READ_UNSIGNED( this_node, rateControlBandwidth);
+    NODE_READ_UNSIGNED( this_node, startKeyframeCount);
+    NODE_READ_UNSIGNED( this_node, startKeyframeInterval);
 }
 
@@ -291 +295 @@
     NODE_WRITE_NUM_T   ( this_node, pjmedia_vid_stream_rc_method, rateControlMethod);
     NODE_WRITE_UNSIGNED( this_node, rateControlBandwidth);
+    NODE_WRITE_UNSIGNED( this_node, startKeyframeCount);
+    NODE_WRITE_UNSIGNED( this_node, startKeyframeInterval);
 }
 
@@ -326 +332 @@
     ret.unreg_timeout           = regConfig.unregWaitMsec;
     ret.reg_use_proxy           = regConfig.proxyUse;
+    ret.reg_contact_params      = str2Pj(regConfig.contactParams);
     for (i=0; i<regConfig.headers.size(); ++i) {
         pj_list_push_back(&ret.reg_hdr_list, &regConfig.headers[i].toPj());
@@ -377 +384 @@
     ret.unpublish_max_wait_time_msec = presConfig.publishShutdownWaitMsec;
     ret.pidf_tuple_id           = str2Pj(presConfig.pidfTupleId);
+
+    // AccountMwiConfig
+    ret.mwi_enabled             = mwiConfig.enabled;
+    ret.mwi_expires             = mwiConfig.expirationSec;
 
     // AccountNatConfig
@@ -430 +441 @@
     ret.vid_stream_rc_cfg.method= videoConfig.rateControlMethod;
     ret.vid_stream_rc_cfg.bandwidth = videoConfig.rateControlBandwidth;
+    ret.vid_stream_sk_cfg.count = videoConfig.startKeyframeCount;
+    ret.vid_stream_sk_cfg.interval = videoConfig.startKeyframeInterval;
 }
 
@@ -454 +467 @@
     regConfig.unregWaitMsec     = prm.unreg_timeout;
     regConfig.proxyUse          = prm.reg_use_proxy;
+    regConfig.contactParams     = pj2Str(prm.reg_contact_params);
     regConfig.headers.clear();
     hdr = prm.reg_hdr_list.next;
@@ -595 +609 @@
     videoConfig.rateControlMethod       = prm.vid_stream_rc_cfg.method;
     videoConfig.rateControlBandwidth    = prm.vid_stream_rc_cfg.bandwidth;
+    videoConfig.startKeyframeCount      = prm.vid_stream_sk_cfg.count;
+    videoConfig.startKeyframeInterval   = prm.vid_stream_sk_cfg.interval;
 }
 
@@ -667 +683 @@
         }
 
-        pjsua_acc_set_user_data(id, NULL);
+        // This caused error message of "Error: cannot find Account.."
+        // when Endpoint::on_reg_started() is called for unregistration.
+        //pjsua_acc_set_user_data(id, NULL);
+
         pjsua_acc_del(id);
     }