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

Allow use of software echo canceller even when hardware one would be available

Browse Source
This commit is contained in:
Juha Heinanen
2025-01-27 05:25:23 +02:00
parent 14b10a0944
commit 6b1743f9c5
5 changed files with 56 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+28 -34
View File
@@ -73,7 +73,6 @@ class BaresipService: Service() {
private lateinit var bluetoothReceiver: BroadcastReceiver
private lateinit var hotSpotReceiver: BroadcastReceiver
private lateinit var androidContactsObserver: ContentObserver
private lateinit var stopState: String
private lateinit var quitTimer: CountDownTimer
@@ -835,31 +834,14 @@ class BaresipService: Service() {
if (am.mode != MODE_IN_COMMUNICATION)
am.mode = MODE_IN_COMMUNICATION
call!!.status = "connected"
if (playerSessionId != 0) {
if (aecAvailable) {
val aec = AcousticEchoCanceler.create(playerSessionId)
if (aec != null) {
if (!aec.getEnabled()) {
aec.setEnabled(true)
if (aec.getEnabled())
Log.d(TAG, "aec is enabled")
else
Log.w(TAG, "Failed to enable AEC")
}
}
else
Log.w(TAG, "Failed to create AEC")
}
playerSessionId = 0
}
if (recorderSessionId != 0) {
if (aecAvailable) {
val aec = AcousticEchoCanceler.create(recorderSessionId)
if (aecAvailable && !webrtcAec) {
aec = AcousticEchoCanceler.create(recorderSessionId)
if (aec != null) {
if (!aec.getEnabled()) {
aec.setEnabled(true)
if (aec.getEnabled())
Log.d(TAG, "aec is enabled")
if (!aec!!.getEnabled()) {
aec!!.setEnabled(true)
if (aec!!.getEnabled())
Log.d(TAG, "AEC is enabled")
else
Log.w(TAG, "Failed to enable AEC")
}
@@ -868,23 +850,28 @@ class BaresipService: Service() {
Log.w(TAG, "Failed to create AEC")
}
if (agcAvailable) {
val agc = AutomaticGainControl.create(recorderSessionId)
if (agc != null)
if (!agc.getEnabled()) {
agc.setEnabled(true)
if (agc.getEnabled())
Log.d(TAG, "agc is enabled")
agc = AutomaticGainControl.create(recorderSessionId)
if (agc != null) {
if (!agc!!.getEnabled()) {
agc!!.setEnabled(true)
if (agc!!.getEnabled())
Log.d(TAG, "AGC is enabled")
}
}
else
Log.w(TAG, "Failed to create AGC")
}
if (nsAvailable) {
val ns = NoiseSuppressor.create(recorderSessionId)
ns = NoiseSuppressor.create(recorderSessionId)
if (ns != null) {
if (!ns.getEnabled()) {
ns.setEnabled(true)
if (ns.getEnabled())
if (!ns!!.getEnabled()) {
ns!!.setEnabled(true)
if (ns!!.getEnabled())
Log.d(TAG, "ns is enabled")
}
}
else
Log.w(TAG, "Failed to create NS")
}
recorderSessionId = 0
}
@@ -970,6 +957,9 @@ class BaresipService: Service() {
nm.cancel(CALL_NOTIFICATION_ID)
stopRinging()
stopMediaPlayer()
aec?.release()
agc?.release()
ns?.release()
val newCall = call.newCall
if (newCall != null) {
newCall.onHoldCall = null
@@ -1631,6 +1621,10 @@ class BaresipService: Service() {
var aecAvailable = AcousticEchoCanceler.isAvailable()
var agcAvailable = AutomaticGainControl.isAvailable()
private val nsAvailable = NoiseSuppressor.isAvailable()
private var aec: AcousticEchoCanceler? = null
private var ns: NoiseSuppressor? = null
private var agc: AutomaticGainControl? = null
var webrtcAec = false
private var btAdapter: BluetoothAdapter? = null
private var playerSessionId = 0
private var recorderSessionId = 0