jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Load webrtc_aecm module only if device does not provide aec

Browse Source
This commit is contained in:
Juha Heinanen
2024-11-16 13:21:52 +02:00
parent 71f7578705
commit d26b7e7696
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
View File

@ -638,24 +638,12 @@ class BaresipService: Service() {
if (ev[0] == "recorder sessionid") {
val sessionId = ev[1].toInt()
Log.d(TAG, "got recorder sessionid $sessionId")
if (AcousticEchoCanceler.isAvailable()) {
Log.i(TAG, "AcousticEchoCanceler IS available")
if (aec)
AcousticEchoCanceler.create(sessionId)
} else {
Log.i(TAG, "AcousticEchoCanceler IS NOT available")
}
if (AutomaticGainControl.isAvailable()) {
Log.i(TAG, "AutomaticGainControl IS available")
AutomaticGainControl.create(sessionId)
} else {
Log.i(TAG, "AutomaticGainControl IS NOT available")
}
if (NoiseSuppressor.isAvailable()) {
Log.i(TAG, "NoiseSuppressor IS available")
if (agc)
AutomaticGainControl.create(sessionId)
if (ns)
NoiseSuppressor.create(sessionId)
} else {
Log.i(TAG, "NoiseSuppressor IS NOT available")
}
return
}
@ -1641,7 +1629,9 @@ class BaresipService: Service() {
// <aor, password> of those accounts that have auth username without auth password
val aorPasswords = mutableMapOf<String, String>()
var audioFocusRequest: AudioFocusRequestCompat? = null
var aec = AcousticEchoCanceler.isAvailable()
var agc = AutomaticGainControl.isAvailable()
private var ns = NoiseSuppressor.isAvailable()
private var btAdapter: BluetoothAdapter? = null
fun requestAudioFocus(ctx: Context): Boolean {

4
app/src/main/kotlin/com/tutpro/baresip/Config.kt
View File

@ -154,11 +154,11 @@ object Config {
if ("${module}.so" in previousModules)
config = "${config}module ${module}.so\n"
if ("webrtc_aecm.so" in previousModules)
if (!BaresipService.aec && "webrtc_aecm.so" in previousModules)
config = "${config}module webrtc_aecm.so\n"
val micGain = previousVariable("augain")
config = if (micGain == "" || micGain == "1.0")
config = if (!BaresipService.agc && (micGain == "" || micGain == "1.0"))
"${config}augain 1.0\n"
else
"${config}module augain.so\naugain $micGain\n"