From 054ae009848fa5b90b6c84083370c0f9d4e84b23 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 27 Apr 2015 11:26:16 +0200 Subject: [PATCH] Cleanup linphonerc files --- Resources/linphonerc | 42 ++++++++++++++++++++++++++++++- Resources/linphonerc-factory | 37 --------------------------- Resources/linphonerc-factory~ipad | 41 +++--------------------------- Resources/linphonerc~ipad | 39 ++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 76 deletions(-) diff --git a/Resources/linphonerc b/Resources/linphonerc index 6812b6238..0f3e852c7 100644 --- a/Resources/linphonerc +++ b/Resources/linphonerc @@ -1,3 +1,9 @@ +[net] +mtu=1300 +activate_edge_workarounds=0 +edge_ping_time=10 +edge_bw=10 + [sip] contact="Linphone iPhone" keepalive_period=30000 @@ -5,10 +11,25 @@ default_proxy=0 sip_port=-1 sip_tcp_port=-1 use_ipv6=0 +inc_timeout=45 +use_info=0 +guess_hostname=1 +register_only_when_network_is_up=1 +auto_net_state_mon=0 +keepalive_period=30000 +ping_with_options=0 +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 [rtp] audio_rtp_port=7076 video_rtp_port=9078 +audio_jitt_comp=60 +video_jitt_comp=60 +nortp_timeout=30 [video] display=1 @@ -30,6 +51,7 @@ capture_dev_id=AU: Audio Unit Receiver eq_active=0 [app] +preview_preference=0 animations_preference=1 edge_opt_preference=0 use_system_contacts=0 @@ -40,4 +62,22 @@ voiceproc_preference=1 enable_log_collect=0 [default_values] -reg_expires=600 \ No newline at end of file +reg_expires=600 + +[wizard] +service_url=https://www.linphone.org/wizard.php +domain=sip.linphone.org +proxy=sip.linphone.org:5223 +password_length=6 +username_length=4 +expires=1314000 +push_notification=1 +transport=tls +sharing_server=https://www.linphone.org:444/upload.php +ice=1 +stun=stun.linphone.org + + +[misc] +history_max_size=30 +max_calls=3 \ No newline at end of file diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index c3064bf5f..5456cc807 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -1,28 +1,6 @@ -[net] -mtu=1300 -activate_edge_workarounds=0 -edge_ping_time=10 -edge_bw=10 [sip] -guess_hostname=1 -inc_timeout=45 -use_info=0 -register_only_when_network_is_up=1 -auto_net_state_mon=0 -keepalive_period=30000 -ping_with_options=0 sip_random_port=0 -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 - -[rtp] -audio_jitt_comp=60 -video_jitt_comp=60 -nortp_timeout=30 [sound] ringer_dev_id=AQ: Audio Queue Device @@ -31,22 +9,7 @@ dtmf_player_amp=0.007 eq_location=mic eq_gains=50:2:50 100:2:50 -[misc] -history_max_size=30 -max_calls=3 -[wizard] -service_url=https://www.linphone.org/wizard.php -domain=sip.linphone.org -proxy=sip.linphone.org:5223 -password_length=6 -username_length=4 -expires=1314000 -push_notification=1 -transport=tls -sharing_server=https://www.linphone.org:444/upload.php -ice=1 -stun=stun.linphone.org [video] display_filter_auto_rotate=0 diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad index 20371b043..5456cc807 100644 --- a/Resources/linphonerc-factory~ipad +++ b/Resources/linphonerc-factory~ipad @@ -1,28 +1,6 @@ -[net] -mtu=1300 -activate_edge_workarounds=0 -edge_ping_time=200 -edge_bw=10 [sip] -guess_hostname=1 -inc_timeout=45 -use_info=0 -register_only_when_network_is_up=1 -auto_net_state_mon=0 -keepalive_period=30000 -ping_with_options=0 sip_random_port=0 -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 - -[rtp] -audio_jitt_comp=60 -video_jitt_comp=60 -nortp_timeout=30 [sound] ringer_dev_id=AQ: Audio Queue Device @@ -31,24 +9,11 @@ dtmf_player_amp=0.007 eq_location=mic eq_gains=50:2:50 100:2:50 -[misc] -history_max_size=30 -max_calls=3 -[wizard] -service_url=https://www.linphone.org/wizard.php -domain=sip.linphone.org -proxy=sip.linphone.org:5223 -password_length=6 -username_length=4 -expires=1314000 -push_notification=1 -transport=tls -sharing_server=https://www.linphone.org:444/upload.php -ice=1 -stun=stun.linphone.org [video] display_filter_auto_rotate=0 - +[app] +#contact_display_username_only=1 +#contact_filter_on_default_domain=1 \ No newline at end of file diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad index 1b6ff9d07..787349e1a 100644 --- a/Resources/linphonerc~ipad +++ b/Resources/linphonerc~ipad @@ -1,3 +1,9 @@ +[net] +mtu=1300 +activate_edge_workarounds=0 +edge_ping_time=10 +edge_bw=10 + [sip] contact="Linphone iPhone" keepalive_period=30000 @@ -5,10 +11,25 @@ default_proxy=0 sip_port=-1 sip_tcp_port=-1 use_ipv6=0 +inc_timeout=45 +use_info=0 +guess_hostname=1 +register_only_when_network_is_up=1 +auto_net_state_mon=0 +keepalive_period=30000 +ping_with_options=0 +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 [rtp] audio_rtp_port=7076 video_rtp_port=9078 +audio_jitt_comp=60 +video_jitt_comp=60 +nortp_timeout=30 [video] display=1 @@ -38,7 +59,25 @@ start_at_boot_preference=1 backgroundmode_preference=1 autoanswer_notif_preference=1 voiceproc_preference=1 +enable_log_collect=0 [default_values] reg_expires=600 +[wizard] +service_url=https://www.linphone.org/wizard.php +domain=sip.linphone.org +proxy=sip.linphone.org:5223 +password_length=6 +username_length=4 +expires=1314000 +push_notification=1 +transport=tls +sharing_server=https://www.linphone.org:444/upload.php +ice=1 +stun=stun.linphone.org + + +[misc] +history_max_size=30 +max_calls=3 \ No newline at end of file