filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VoIP: fix call candidate parsing

This commit is contained in:
ganfra 2020-12-01 19:38:09 +01:00
parent 4a3f0c8898
commit 7af82af935
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidate.kt
View File

@ -24,13 +24,13 @@ data class CallCandidate(
/** /**
* Required. The SDP media type this candidate is intended for. * Required. The SDP media type this candidate is intended for.
*/ */
@Json(name = "sdpMid") val sdpMid: String, @Json(name = "sdpMid") val sdpMid: String? = null,
/** /**
* Required. The index of the SDP 'm' line this candidate is intended for. * Required. The index of the SDP 'm' line this candidate is intended for.
*/ */
@Json(name = "sdpMLineIndex") val sdpMLineIndex: Int, @Json(name = "sdpMLineIndex") val sdpMLineIndex: Int = 0,
/** /**
* Required. The SDP 'a' line of the candidate. * Required. The SDP 'a' line of the candidate.
*/ */
@Json(name = "candidate") val candidate: String @Json(name = "candidate") val candidate: String? = null
) )

1
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
View File

@ -105,6 +105,7 @@ internal class MxCallImpl(
} }
override fun sendLocalIceCandidates(candidates: List<CallCandidate>) { override fun sendLocalIceCandidates(candidates: List<CallCandidate>) {
Timber.v("Send local ice canditates $callId: $candidates")
CallCandidatesContent( CallCandidatesContent(
callId = callId, callId = callId,
partyId = ourPartyId, partyId = ourPartyId,

3
vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
View File

@ -729,6 +729,9 @@ class WebRtcCall(val mxCall: MxCall,
fun onCallIceCandidateReceived(iceCandidatesContent: CallCandidatesContent) { fun onCallIceCandidateReceived(iceCandidatesContent: CallCandidatesContent) {
GlobalScope.launch(dispatcher) { GlobalScope.launch(dispatcher) {
iceCandidatesContent.candidates.forEach { iceCandidatesContent.candidates.forEach {
if (it.sdpMid.isNullOrEmpty() || it.candidate.isNullOrEmpty()) {
return@forEach
}
Timber.v("## VOIP onCallIceCandidateReceived for call ${mxCall.callId} sdp: ${it.candidate}") Timber.v("## VOIP onCallIceCandidateReceived for call ${mxCall.callId} sdp: ${it.candidate}")
val iceCandidate = IceCandidate(it.sdpMid, it.sdpMLineIndex, it.candidate) val iceCandidate = IceCandidate(it.sdpMid, it.sdpMLineIndex, it.candidate)
remoteCandidateSource.onNext(iceCandidate) remoteCandidateSource.onNext(iceCandidate)