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

Audio related fixes

Browse Source
This commit is contained in:
Juha Heinanen
2026-05-02 08:52:27 +03:00
parent c309b6cb03
commit 676e8491d4
2 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -882,24 +882,25 @@ class BaresipService: Service() {
stopMediaPlayer()
val hasTelecom = ConnectionService.connections.containsKey(callp) ||
ConnectionService.pendingOutgoingConnection != null
if (!hasTelecom)
if (!hasTelecom) {
setCallVolume()
ensureCommunicationMode()
ensureCommunicationMode()
}
proximitySensing(proximitySensing)
}
"call ringing" -> {
ConnectionService.connections[callp]?.setRinging()
ensureCommunicationMode()
playRingBack()
if (!telecom) {
ensureCommunicationMode()
playRingBack()
}
return
}
"call progress" -> {
ensureCommunicationMode()
if (!telecom) ensureCommunicationMode()
if ((ev[1].toInt() and Api.SDP_RECVONLY) != 0)
stopMediaPlayer()
else {
ConnectionService.connections[callp]?.setRinging()
playRingBack()
if (!telecom) playRingBack()
}
return
}
@ -939,7 +940,7 @@ class BaresipService: Service() {
)
if (resourceId != 0) {
ensureCommunicationMode()
playUnInterrupted(resourceId, 1)
if (!telecom) playUnInterrupted(resourceId, 1)
} else {
Log.e(TAG, "Callwaiting tone $name.wav not found")
}
@ -993,6 +994,7 @@ class BaresipService: Service() {
"call established" -> {
ConnectionService.connections[callp]?.setActive()
ensureCommunicationMode()
stopMediaPlayer()
nm.cancel(CALL_NOTIFICATION_ID)
Log.d(TAG, "AoR $aor call $callp established")
call!!.status.value = "connected"
@ -1628,9 +1630,8 @@ class BaresipService: Service() {
.setCustomContentView(notificationLayout)
val notification = buildStatusNotification()
try {
if (VERSION.SDK_INT >= 34)
startForeground(STATUS_NOTIFICATION_ID, notification,
ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
if (VERSION.SDK_INT >= 29)
startForeground(STATUS_NOTIFICATION_ID, notification, foregroundServiceType())
else
startForeground(STATUS_NOTIFICATION_ID, notification)
} catch (e: Exception) {
@ -1728,14 +1729,8 @@ class BaresipService: Service() {
try {
if (activeCall != null) {
val type = if (VERSION.SDK_INT >= 30) {
if (ContextCompat.checkSelfPermission(this, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED)
FOREGROUND_SERVICE_TYPE_PHONE_CALL or FOREGROUND_SERVICE_TYPE_MICROPHONE
else
FOREGROUND_SERVICE_TYPE_PHONE_CALL
} else 0
if (VERSION.SDK_INT >= 29)
startForeground(STATUS_NOTIFICATION_ID, notification, type)
startForeground(STATUS_NOTIFICATION_ID, notification, foregroundServiceType())
else
startForeground(STATUS_NOTIFICATION_ID, notification)
isNotificationInCall = true
@ -1743,11 +1738,8 @@ class BaresipService: Service() {
if (isNotificationInCall) {
stopForeground(STOP_FOREGROUND_REMOVE)
isNotificationInCall = false
if (VERSION.SDK_INT >= 34)
startForeground(STATUS_NOTIFICATION_ID, notification,
ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
else if (VERSION.SDK_INT >= 30)
startForeground(STATUS_NOTIFICATION_ID, notification, 0)
if (VERSION.SDK_INT >= 29)
startForeground(STATUS_NOTIFICATION_ID, notification, foregroundServiceType())
else
startForeground(STATUS_NOTIFICATION_ID, notification)
} else {
@ -1762,6 +1754,19 @@ class BaresipService: Service() {
}
}
private fun foregroundServiceType(): Int {
return if (VERSION.SDK_INT >= 34) {
ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
} else if (VERSION.SDK_INT >= 30) {
if (ContextCompat.checkSelfPermission(this, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED)
FOREGROUND_SERVICE_TYPE_PHONE_CALL or FOREGROUND_SERVICE_TYPE_MICROPHONE
else
FOREGROUND_SERVICE_TYPE_PHONE_CALL
} else {
0
}
}
@SuppressLint("WakelockTimeout")
private fun updatePartialWakeLock() {
// Hold the wake lock as long as the service is active to ensure

25
app/src/main/kotlin/com/tutpro/baresip/ConnectionService.kt
View File

@ -69,6 +69,7 @@ class ConnectionService : ConnectionService() {
Connection.CAPABILITY_HOLD or
Connection.CAPABILITY_MERGE_CONFERENCE or
Connection.CAPABILITY_SWAP_CONFERENCE
connection.audioModeIsVoip = true
val call = Call.ofCallp(callp)
if (call != null)
@ -76,17 +77,6 @@ class ConnectionService : ConnectionService() {
val ua = UserAgent.ofUap(uap)
if (ua != null) {
if (BaresipService.speakerPhone || BaresipService.speakerPhoneAuto) {
BaresipService.speakerPhone = true
@Suppress("DEPRECATION")
connection.setAudioRoute(CallAudioState.ROUTE_SPEAKER)
BaresipService.postServiceEvent(
ServiceEvent("speaker update,true",
arrayListOf(uap, callp),
System.nanoTime()
)
)
}
if (ua.account.answerMode == Api.ANSWERMODE_AUTO) {
Log.d(TAG, "Auto-answering call $callp")
connection.onAnswer()
@ -128,23 +118,12 @@ class ConnectionService : ConnectionService() {
val connection = BaresipConnection(uap, 0L)
pendingOutgoingConnection = connection
if (BaresipService.speakerPhone || BaresipService.speakerPhoneAuto) {
BaresipService.speakerPhone = true
@Suppress("DEPRECATION")
connection.setAudioRoute(CallAudioState.ROUTE_SPEAKER)
BaresipService.postServiceEvent(
ServiceEvent("speaker update,true",
arrayListOf(uap, 0L),
System.nanoTime()
)
)
}
connection.setAddress(request?.address, TelecomManager.PRESENTATION_ALLOWED)
connection.connectionCapabilities = Connection.CAPABILITY_SUPPORT_HOLD or
Connection.CAPABILITY_HOLD or
Connection.CAPABILITY_MERGE_CONFERENCE or
Connection.CAPABILITY_SWAP_CONFERENCE
connection.audioModeIsVoip = true
// Start the SIP connection logic
if (uap != 0L) {