From e04acb866a68ff7d503c97aa9eee1ae1befc0d6c Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 28 Oct 2025 15:42:33 +0200
Subject: [PATCH] New G.722 codec implementation with less dependencies Removed
 G.726 codec due to too many dependencies

---
 app/src/main/cpp/CMakeLists.txt                  | 8 ++++----
 app/src/main/kotlin/com/tutpro/baresip/Config.kt | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 99087488..0c067010 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -22,9 +22,9 @@ 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 STATIC IMPORTED)
+set_target_properties(lib_g722 PROPERTIES IMPORTED_LOCATION
+        ${distribution_DIR}/g722/lib/${ANDROID_ABI}/libg722.a)
 
 add_library(lib_g722_1 STATIC IMPORTED)
 set_target_properties(lib_g722_1 PROPERTIES IMPORTED_LOCATION
@@ -79,7 +79,7 @@ target_link_libraries(baresip
         lib_ssl
         lib_crypto
         lib_opus
-        lib_spandsp
+        lib_g722
         lib_g722_1
         lib_g729
         lib_codec2
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
index e7d21977..4d79f8a3 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
@@ -10,7 +10,7 @@ import java.nio.charset.StandardCharsets
 object Config {
 
     private val configPath = BaresipService.filesPath + "/config"
-    val audioModules = listOf("opus", "amr", "g722", "g7221", "g726", "g729", "codec2", "g711")
+    val audioModules = listOf("opus", "amr", "libg722", "g7221", "g726", "g729", "codec2", "g711")
     private lateinit var config: String
     private lateinit var previousConfig: String
     private lateinit var previousLines: List<String>
@@ -174,8 +174,9 @@ object Config {
 
         val previousModules = previousVariables("module")
         for (module in audioModules)
-            if ("${module}.so" in previousModules)
-                config = "${config}module ${module}.so\n"
+            if ("${module}.so" in previousModules ||
+                (module == "libg722" && "g722.so" in previousModules))
+                    config = "${config}module ${module}.so\n"
 
         Utils.aecAgcCheck()