mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated the StreamCapability/StreamAvailability detection of participant device in conference (modelled from Anroid)

Browse source
This commit is contained in:
Christophe Deschamps 2023-06-20 13:09:44 +02:00
parent eb5305107e
commit c368b247e7
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Classes/Swift/Voip/ViewModels/ConferenceParticipantDeviceData.swift
View file

@ -26,6 +26,9 @@ class ConferenceParticipantDeviceData {
let isMe:Bool
let videoEnabled = MutableLiveData<Bool>()
let videoAvailable = MutableLiveData<Bool>()
let isSendingVideo = MutableLiveData<Bool>()
let isSpeaking = MutableLiveData<Bool>()
let micMuted = MutableLiveData<Bool>()
@ -63,15 +66,15 @@ class ConferenceParticipantDeviceData {
},
onStreamCapabilityChanged: { (participantDevice, direction, streamType) in
Log.i("[Conference Participant Device] Participant \(participantDevice.address?.asStringUriOnly()) video stream direction changed: \(direction)")
self.videoEnabled.value = direction == MediaDirection.SendOnly || direction == MediaDirection.SendRecv
if (streamType == StreamType.Video) {
self.isSendingVideo.value = direction == MediaDirection.SendRecv || direction == MediaDirection.SendOnly
Log.i("[Conference Participant Device] Participant [\(participantDevice.address?.asStringUriOnly())] video capability changed to \(direction)")
}
},
onStreamAvailabilityChanged: { (participantDevice, available, streamType) in
if (streamType == StreamType.Video) {
Log.i("[Conference Participant Device] Participant [\(participantDevice.address?.asStringUriOnly())] video availability changed to \(available)")
self.videoEnabled.value = available
self.videoAvailable.value = available
}
}
@ -81,10 +84,17 @@ class ConferenceParticipantDeviceData {
isSpeaking.value = false
micMuted.value = participantDevice.isMuted
videoEnabled.value = participantDevice.getStreamAvailability(streamType: .Video)
let videoCapability = participantDevice.getStreamCapability(streamType: StreamType.Video)
isSendingVideo.value = videoCapability == MediaDirection.SendRecv || videoCapability == MediaDirection.SendOnly
videoAvailable.value = participantDevice.getStreamAvailability(streamType: .Video)
videoAvailable.readCurrentAndObserve { _ in
self.videoEnabled.value = self.isVideoAvailableAndSendReceive()
}
isSendingVideo.observe { _ in
self.videoEnabled.value = self.isVideoAvailableAndSendReceive()
}
isInConference.value = participantDevice.isInConference
let videoCapability = participantDevice.getStreamCapability(streamType: .Video)
isJoining.value = [.Joining,.Alerting].contains(participantDevice.state)
@ -122,4 +132,8 @@ class ConferenceParticipantDeviceData {
participantDevice.nativeVideoWindowId = UnsafeMutableRawPointer(Unmanaged.passRetained(view).toOpaque())
}
}
private func isVideoAvailableAndSendReceive() -> Bool {
return videoAvailable.value == true && isSendingVideo.value == true
}
}