gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-24 14:09:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename attribute to a more accurate name

Browse Source 
The SDP constraints should be set when the MCU is used, but only for
publisher connections; receiver connections should use the general SDP
constraints.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2024-12-23 18:33:33 +01:00 committed by Marcel Hibbe
parent 22efcd7e83
commit 94257da123
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
View File

@ -204,7 +204,7 @@ class CallActivity : CallBaseActivity() {
private var audioConstraints: MediaConstraints? = null private var audioConstraints: MediaConstraints? = null
private var videoConstraints: MediaConstraints? = null private var videoConstraints: MediaConstraints? = null
private var sdpConstraints: MediaConstraints? = null private var sdpConstraints: MediaConstraints? = null
private var sdpConstraintsForMCU: MediaConstraints? = null private var sdpConstraintsForMCUPublisher: MediaConstraints? = null
private var videoSource: VideoSource? = null private var videoSource: VideoSource? = null
private var localVideoTrack: VideoTrack? = null private var localVideoTrack: VideoTrack? = null
private var audioSource: AudioSource? = null private var audioSource: AudioSource? = null
@ -809,7 +809,7 @@ class CallActivity : CallBaseActivity() {
// create sdpConstraints // create sdpConstraints
sdpConstraints = MediaConstraints() sdpConstraints = MediaConstraints()
sdpConstraintsForMCU = MediaConstraints() sdpConstraintsForMCUPublisher = MediaConstraints()
sdpConstraints!!.mandatory.add(MediaConstraints.KeyValuePair("OfferToReceiveAudio", "true")) sdpConstraints!!.mandatory.add(MediaConstraints.KeyValuePair("OfferToReceiveAudio", "true"))
var offerToReceiveVideoString = "true" var offerToReceiveVideoString = "true"
if (isVoiceOnlyCall) { if (isVoiceOnlyCall) {
@ -818,10 +818,10 @@ class CallActivity : CallBaseActivity() {
sdpConstraints!!.mandatory.add( sdpConstraints!!.mandatory.add(
MediaConstraints.KeyValuePair("OfferToReceiveVideo", offerToReceiveVideoString) MediaConstraints.KeyValuePair("OfferToReceiveVideo", offerToReceiveVideoString)
) )
sdpConstraintsForMCU!!.mandatory.add(MediaConstraints.KeyValuePair("OfferToReceiveAudio", "false")) sdpConstraintsForMCUPublisher!!.mandatory.add(MediaConstraints.KeyValuePair("OfferToReceiveAudio", "false"))
sdpConstraintsForMCU!!.mandatory.add(MediaConstraints.KeyValuePair("OfferToReceiveVideo", "false")) sdpConstraintsForMCUPublisher!!.mandatory.add(MediaConstraints.KeyValuePair("OfferToReceiveVideo", "false"))
sdpConstraintsForMCU!!.optional.add(MediaConstraints.KeyValuePair("internalSctpDataChannels", "true")) sdpConstraintsForMCUPublisher!!.optional.add(MediaConstraints.KeyValuePair("internalSctpDataChannels", "true"))
sdpConstraintsForMCU!!.optional.add(MediaConstraints.KeyValuePair("DtlsSrtpKeyAgreement", "true")) sdpConstraintsForMCUPublisher!!.optional.add(MediaConstraints.KeyValuePair("DtlsSrtpKeyAgreement", "true"))
sdpConstraints!!.optional.add(MediaConstraints.KeyValuePair("internalSctpDataChannels", "true")) sdpConstraints!!.optional.add(MediaConstraints.KeyValuePair("internalSctpDataChannels", "true"))
sdpConstraints!!.optional.add(MediaConstraints.KeyValuePair("DtlsSrtpKeyAgreement", "true")) sdpConstraints!!.optional.add(MediaConstraints.KeyValuePair("DtlsSrtpKeyAgreement", "true"))
if (!isVoiceOnlyCall) { if (!isVoiceOnlyCall) {
@ -2374,7 +2374,7 @@ class CallActivity : CallBaseActivity() {
return PeerConnectionWrapper( return PeerConnectionWrapper(
peerConnectionFactory, peerConnectionFactory,
iceServers, iceServers,
sdpConstraintsForMCU, sdpConstraintsForMCUPublisher,
sessionId, sessionId,
callSession, callSession,
tempLocalStream, tempLocalStream,