narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

synchronize renegotiate to avoid race condition when that fails

Browse source
This commit is contained in:
Daniel Gultsch 2024-05-06 13:40:10 +02:00
parent 359b2150eb
commit a46246c423
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
View file

@ -2482,7 +2482,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
this.webRTCWrapper.execute(this::renegotiate); this.webRTCWrapper.execute(this::renegotiate);
} }
private void renegotiate() { private synchronized void renegotiate() {
final SessionDescription sessionDescription; final SessionDescription sessionDescription;
try { try {
sessionDescription = setLocalSessionDescription(); sessionDescription = setLocalSessionDescription();
@ -2531,11 +2531,12 @@ public class JingleRtpConnection extends AbstractJingleConnection
+ this.webRTCWrapper.getSignalingState()); + this.webRTCWrapper.getSignalingState());
} }
if (diff.added.size() > 0) { if (diff.added.isEmpty()) {
return;
}
modifyLocalContentMap(rtpContentMap); modifyLocalContentMap(rtpContentMap);
sendContentAdd(rtpContentMap, diff.added); sendContentAdd(rtpContentMap, diff.added);
} }
}
private void initiateIceRestart(final RtpContentMap rtpContentMap) { private void initiateIceRestart(final RtpContentMap rtpContentMap) {
final RtpContentMap transportInfo = rtpContentMap.transportInfo(); final RtpContentMap transportInfo = rtpContentMap.transportInfo();