From 19c48bf370934663c5af1c8d585d0eb5012f47f0 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 10 Jul 2014 14:24:16 +0200 Subject: [PATCH] Enable RTCP-XR and quality reporting ONLY for sip.linphone.org accounts This reverts commit 7afb2dd8db9444e010ed586a7a2acb2889e8152f. --- res/raw/linphonerc_factory | 11 ----------- src/org/linphone/LinphonePreferences.java | 22 ++++++++++++++++++++++ src/org/linphone/setup/SetupActivity.java | 11 ++++++++--- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory index 17fed0bd4..7d32cbd63 100644 --- a/res/raw/linphonerc_factory +++ b/res/raw/linphonerc_factory @@ -18,12 +18,6 @@ audio_jitt_comp=60 video_jitt_comp=60 nortp_timeout=30 disable_upnp=1 -rtcp_xr_enabled=1 -rtcp_xr_rcvr_rtt_mode=all -rtcp_xr_rcvr_rtt_max_size=10000 -rtcp_xr_stat_summary_enabled=1 -rtcp_xr_voip_metrics_enabled=1 - [sound] playback_dev_id= @@ -35,8 +29,3 @@ dtmf_player_amp=0.1 [misc] max_calls=10 - -[proxy_default_values] -quality_reporting_collector=sip:voip-metrics@sip.linphone.org -quality_reporting_enabled=1 -quality_reporting_interval=180 diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index 77a20116a..f5a762703 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -164,9 +164,13 @@ public class LinphonePreferences { private TransportType tempTransport; private boolean tempAvpfEnabled = false; private int tempAvpfRRInterval = 0; + private String tempQualityReportingCollector; + private boolean tempQualityReportingEnabled = false; + private int tempQualityReportingInterval = 0; private boolean tempEnabled = true; private boolean tempNoDefault = false; + public AccountBuilder(LinphoneCore lc) { this.lc = lc; } @@ -231,6 +235,21 @@ public class LinphonePreferences { return this; } + public AccountBuilder setQualityReportingCollector(String collector) { + tempQualityReportingCollector = collector; + return this; + } + + public AccountBuilder setQualityReportingEnabled(boolean enable) { + tempQualityReportingEnabled = enable; + return this; + } + + public AccountBuilder setQualityReportingInterval(int interval) { + tempQualityReportingInterval = interval; + return this; + } + public AccountBuilder setEnabled(boolean enable) { tempEnabled = enable; return this; @@ -283,6 +302,9 @@ public class LinphonePreferences { prxCfg.enableAvpf(tempAvpfEnabled); prxCfg.setAvpfRRInterval(tempAvpfRRInterval); + prxCfg.enableQualityReporting(tempQualityReportingEnabled); + prxCfg.setQualityReportingCollector(tempQualityReportingCollector); + prxCfg.setQualityReportingInterval(tempQualityReportingInterval); LinphoneAuthInfo authInfo = LinphoneCoreFactory.instance().createAuthInfo(tempUsername, tempUserId, tempPassword, null, null, tempDomain); diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java index 9dbd64dc8..ec18e8ceb 100644 --- a/src/org/linphone/setup/SetupActivity.java +++ b/src/org/linphone/setup/SetupActivity.java @@ -306,9 +306,14 @@ public class SetupActivity extends FragmentActivity implements OnClickListener { } builder.setExpires("604800") - .setOutboundProxyEnabled(true); - builder.setAvpfEnabled(true); - builder.setAvpfRRInterval(3); + .setOutboundProxyEnabled(true) + .setAvpfEnabled(true) + .setAvpfRRInterval(3) + .setQualityReportingCollector("sip:voip-metrics@sip.linphone.org") + .setQualityReportingEnabled(true) + .setQualityReportingInterval(180); + + mPrefs.setStunServer(getString(R.string.default_stun)); mPrefs.setIceEnabled(true); mPrefs.setPushNotificationEnabled(true);