From b08ab03e8c06141478150bf5f23b7846e5cad565 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Sun, 29 Sep 2019 10:44:30 +0300 Subject: [PATCH] - Added support for G.726 codec. --- app/src/main/assets/config | 9 +++++---- app/src/main/kotlin/com/tutpro/baresip/Config.kt | 16 +++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/src/main/assets/config b/app/src/main/assets/config index e38fcc42..b1f617ba 100644 --- a/app/src/main/assets/config +++ b/app/src/main/assets/config @@ -20,11 +20,12 @@ jitter_buffer_delay 5-10 rtp_stats no dyn_dns yes net_prefer_ipv6 no -module ilbc.so -module g722.so -module g7221.so -module g711.so module opus.so +module ilbc.so +module g7221.so +module g722.so +module g726.so +module g711.so module webrtc_aec.so module opensles.so module stun.so diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt index c1c42e7f..0ad66eea 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt @@ -20,16 +20,14 @@ object Config { config = "${config}ausrc_format s16\nauplay_format s16\nauenc_format s16\naudec_format s16\nmodule webrtc_aec.so\n" write = true } - if (!config.contains(Regex("module[ ]+g722.so"))) { - config = "${config}module g722.so\n" - write = true - } - if (!config.contains(Regex("module[ ]+g7221.so"))) { - config = "${config}module g7221.so\n" - write = true - } - if (!config.contains(Regex("module[ ]+ilbc.so"))) { + if (!config.contains(Regex("module_app[ ]+g726.so"))) { + config = config.replace(Regex("module[ ]+g7...?.so\n"), "") + config = config.replace(Regex("module[ ]+ilbc.so\n"), "") config = "${config}module ilbc.so\n" + config = "${config}module g7221.so\n" + config = "${config}module g722.so\n" + config = "${config}module g726.so\n" + config = "${config}module g711.so\n" write = true } if (config.contains(Regex("#module_app[ ]+mwi.so"))) {