Merge branch 'amr'

2019-10-15 12:52:18 +03:00
parent 3f39543517 8f949a75c6
commit a79f1cf71e
4 changed files with 40 additions and 31 deletions
@@ -21,9 +21,10 @@ 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[ ]+g726.so"))) {
+        if (!config.contains(Regex("module[ ]+amr.so"))) {
            config = config.replace(Regex("module[ ]+g7...?.so\n"), "")
            config = config.replace(Regex("module[ ]+ilbc.so\n"), "")
+            config = "${config}module amr.so\n"
            config = "${config}module ilbc.so\n"
            config = "${config}module g7221.so\n"
            config = "${config}module g722.so\n"
@@ -94,6 +95,7 @@ object Config {
                write = true
            }
        }
+
        if (write) {
            Log.e("Baresip", "Writing config '$config'")
            Utils.putFileContents(configPath, config.toByteArray())