From fb586a383756c0334423d543757242f410240b42 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Thu, 26 Sep 2019 12:26:11 +0300
Subject: [PATCH] - Added support for G722 codec.

---
 app/src/main/assets/config                       | 1 +
 app/src/main/cpp/CMakeLists.txt                  | 5 +++++
 app/src/main/kotlin/com/tutpro/baresip/Config.kt | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/app/src/main/assets/config b/app/src/main/assets/config
index 4ef2163e..e38fcc42 100644
--- a/app/src/main/assets/config
+++ b/app/src/main/assets/config
@@ -21,6 +21,7 @@ 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
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index a81be15b..058106b4 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -23,6 +23,10 @@ add_library(lib_opus STATIC IMPORTED)
 set_target_properties(lib_opus PROPERTIES IMPORTED_LOCATION
         ${distribution_DIR}/opus/lib/${ANDROID_ABI}/libopus.a)
 
+add_library(lib_spandsp STATIC IMPORTED)
+set_target_properties(lib_spandsp PROPERTIES IMPORTED_LOCATION
+		${distribution_DIR}/spandsp/lib/${ANDROID_ABI}/libspandsp.a)
+
 add_library(lib_g722_1 STATIC IMPORTED)
 set_target_properties(lib_g722_1 PROPERTIES IMPORTED_LOCATION
 		${distribution_DIR}/g7221/lib/${ANDROID_ABI}/libg722_1.a)
@@ -64,6 +68,7 @@ target_link_libraries(baresip
 		lib_ssl
 		lib_crypto
 		lib_opus
+		lib_spandsp
 		lib_g722_1
 		lib_ilbc
 		lib_webrtc
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
index cd906a7f..c1c42e7f 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
@@ -20,6 +20,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[ ]+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