New G.722 codec implementation with less dependencies
Removed G.726 codec due to too many dependencies
This commit is contained in:
@ -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
|
||||
|
||||
@ -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()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user