From 471f92ef77ee3b9e23c4a176419a4db3d27fd5be Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 3 May 2016 16:54:31 +0200 Subject: [PATCH] Removed specific rc files for audio bypass --- tester/audio_bypass_tester.c | 7 ++- tester/rcfiles/marie_rc_audio_bypass | 67 -------------------------- tester/rcfiles/pauline_rc_audio_bypass | 65 ------------------------- 3 files changed, 5 insertions(+), 134 deletions(-) delete mode 100644 tester/rcfiles/marie_rc_audio_bypass delete mode 100644 tester/rcfiles/pauline_rc_audio_bypass diff --git a/tester/audio_bypass_tester.c b/tester/audio_bypass_tester.c index 5e2d5e6fc..3f248f4d8 100644 --- a/tester/audio_bypass_tester.c +++ b/tester/audio_bypass_tester.c @@ -428,12 +428,12 @@ static void only_enable_payload(LinphoneCore *lc, const char *mime, int rate, in } static void audio_bypass(void) { - LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc_audio_bypass"); + LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); LinphoneCore *marie_lc = marie->lc; MSFactory *marie_factory = linphone_core_get_ms_factory(marie_lc); MSSndCardManager *marie_sndcard_manager = ms_factory_get_snd_card_manager(marie_factory); - LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc_audio_bypass"); + LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc"); LinphoneCore *pauline_lc = pauline->lc; MSFactory *pauline_factory = linphone_core_get_ms_factory(pauline_lc); MSSndCardManager *pauline_sndcard_manager = ms_factory_get_snd_card_manager(pauline_factory); @@ -444,6 +444,9 @@ static void audio_bypass(void) { double similar=1; const double threshold = 0.85; + lp_config_set_string(marie_lc->config, "sound", "features", "None"); + lp_config_set_string(pauline_lc->config, "sound", "features", "None"); + /*make sure the record file doesn't already exists, otherwise this test will append new samples to it*/ unlink(recordpath); diff --git a/tester/rcfiles/marie_rc_audio_bypass b/tester/rcfiles/marie_rc_audio_bypass deleted file mode 100644 index 51ebb55b6..000000000 --- a/tester/rcfiles/marie_rc_audio_bypass +++ /dev/null @@ -1,67 +0,0 @@ -[sip] -sip_port=-1 -sip_tcp_port=-1 -sip_tls_port=-1 -default_proxy=0 -ping_with_options=0 -composing_idle_timeout=1 -store_ha1_passwd=0 #used for sipp - -[auth_info_0] -username=marie -userid=marie -passwd=secret -realm=sip.example.org - -[proxy_0] -reg_proxy=sip.example.org;transport=tcp -reg_route=sip.example.org;transport=tcp;lr -reg_identity="Super Marie" -reg_expires=3600 -reg_sendregister=1 -publish=0 -dial_escape_plus=0 - -[friend_0] -url="Paupoche" -pol=accept -subscribe=0 - -[rtp] -audio_rtp_port=18070-28000 -video_rtp_port=28070-38000 -text_rtp_port=39000-49000 - -[video] -display=0 -capture=0 -show_local=0 -size=qcif -enabled=0 -self_view=0 -automatically_initiate=0 -automatically_accept=0 -device=StaticImage: Static picture - -[sound] -echocancellation=0 #to not overload cpu in case of VG -features=NONE - -[net] -dns_srv_enabled=0 #no srv needed in general -stun_server=stun.linphone.org - -[misc] -add_missing_audio_codecs=1 - -[audio_codec_0] -mime=L16 -rate=44100 -channels=2 -enabled=0 - -[audio_codec_1] -mime=L16 -rate=44100 -channels=1 -enabled=1 diff --git a/tester/rcfiles/pauline_rc_audio_bypass b/tester/rcfiles/pauline_rc_audio_bypass deleted file mode 100644 index c164bed26..000000000 --- a/tester/rcfiles/pauline_rc_audio_bypass +++ /dev/null @@ -1,65 +0,0 @@ -[sip] -sip_port=-1 -sip_tcp_port=-1 -sip_tls_port=-1 -default_proxy=0 -ping_with_options=0 -composing_idle_timeout=1 - -[auth_info_0] -username=pauline -userid=pauline -passwd=secret -realm=sip.example.org - -[proxy_0] -reg_proxy=sip2.linphone.org;transport=tls -reg_route=sip2.linphone.org;transport=tls -reg_identity=sip:pauline@sip.example.org -reg_expires=3600 -reg_sendregister=1 -publish=0 -dial_escape_plus=0 - -#[friend_0] -#url="Mariette" -#pol=accept -#subscribe=0 - -[rtp] -audio_rtp_port=18070-28000 -video_rtp_port=39072-49000 - -[video] -display=0 -capture=0 -show_local=0 -size=qcif -enabled=0 -self_view=0 -automatically_initiate=0 -automatically_accept=0 -device=StaticImage: Static picture - -[sound] -echocancellation=0 #to not overload cpu in case of VG -features=NONE - -[net] -dns_srv_enabled=0 #no srv needed in general -stun_server=stun.linphone.org - -[misc] -add_missing_audio_codecs=1 - -[audio_codec_0] -mime=L16 -rate=44100 -channels=2 -enabled=0 - -[audio_codec_1] -mime=L16 -rate=44100 -channels=1 -enabled=1