Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed switch from audio only to active speaker or mosaic that enables the video without user consent + improved some conference logs

Browse source
This commit is contained in:
Sylvain Berfini 2022-12-14 17:16:07 +01:00
parent 2ca76ef44f
commit 6cebb8cb92
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/org/linphone/activities/voip/viewmodels/ConferenceViewModel.kt
View file

@ -383,7 +383,17 @@ class ConferenceViewModel : ViewModel() {
} }
params.isVideoEnabled = layout != ConferenceDisplayMode.AUDIO_ONLY params.isVideoEnabled = layout != ConferenceDisplayMode.AUDIO_ONLY
if (forceSendingVideo) params.videoDirection = MediaDirection.SendRecv if (forceSendingVideo) {
Log.w("[Conference] Forcing video direction to SendRecv")
params.videoDirection = MediaDirection.SendRecv
} else {
if (conferenceDisplayMode.value == ConferenceDisplayMode.AUDIO_ONLY) {
// Previous layout was audio only, make sure video isn't sent without user consent when switching layout
params.videoDirection = MediaDirection.RecvOnly
}
Log.i("[Conference] Video direction is ${params.videoDirection}")
}
params.conferenceVideoLayout = when (layout) { params.conferenceVideoLayout = when (layout) {
ConferenceDisplayMode.GRID -> ConferenceLayout.Grid ConferenceDisplayMode.GRID -> ConferenceLayout.Grid
else -> ConferenceLayout.ActiveSpeaker else -> ConferenceLayout.ActiveSpeaker
@ -404,7 +414,7 @@ class ConferenceViewModel : ViewModel() {
private fun updateConferenceLayout(conference: Conference) { private fun updateConferenceLayout(conference: Conference) {
val call = conference.call val call = conference.call
if (call == null) { if (call == null) {
Log.e("[Conference] Conference call is null!") Log.e("[Conference] Call is null!")
return return
} }
@ -421,7 +431,7 @@ class ConferenceViewModel : ViewModel() {
val list = sortDevicesDataList(conferenceParticipantDevices.value.orEmpty()) val list = sortDevicesDataList(conferenceParticipantDevices.value.orEmpty())
conferenceParticipantDevices.value = list conferenceParticipantDevices.value = list
Log.i("[Conference] Conference current layout is: ${conferenceDisplayMode.value}") Log.i("[Conference] Current layout is [${conferenceDisplayMode.value}], video direction is [${params.videoDirection}]")
} }
private fun terminateConference(conference: Conference) { private fun terminateConference(conference: Conference) {