matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

Fixes for call state machine

Browse Source 
* Set 'connecting' state before sending answer, otherwise it can
   race with ICE connecting
 * Ignore completed ice connection state: connected is what we care about
 * Null-check remotestream when stopping media
 * Comments
This commit is contained in:
David Baker
2020-10-09 18:45:45 +01:00
parent 65b24f595c
commit 7f21c591ae
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/webrtc/call.ts
View File

@@ -645,8 +645,8 @@ export class MatrixCall extends EventEmitter {
}; };
private sendAnswer() { private sendAnswer() {
this.sendEvent('m.call.answer', this.answerContent).then(() => {
this.setState(CallState.Connecting); this.setState(CallState.Connecting);
this.sendEvent('m.call.answer', this.answerContent).then(() => {
// If this isn't the first time we've tried to send the answer, // If this isn't the first time we've tried to send the answer,
// we may have candidates queued up, so send them now. // we may have candidates queued up, so send them now.
this.sendCandidateQueue(); this.sendCandidateQueue();
@@ -896,12 +896,11 @@ export class MatrixCall extends EventEmitter {
return; // because ICE can still complete as we're ending the call return; // because ICE can still complete as we're ending the call
} }
logger.debug( logger.debug(
"Ice connection state changed to: " + this.peerConn.iceConnectionState, "ICE connection state changed to: " + this.peerConn.iceConnectionState,
); );
// ideally we'd consider the call to be connected when we get media but // ideally we'd consider the call to be connected when we get media but
// chrome doesn't implement any of the 'onstarted' events yet // chrome doesn't implement any of the 'onstarted' events yet
if (this.peerConn.iceConnectionState == 'completed' || if (this.peerConn.iceConnectionState == 'connected') {
this.peerConn.iceConnectionState == 'connected') {
this.setState(CallState.Connected); this.setState(CallState.Connected);
} else if (this.peerConn.iceConnectionState == 'failed') { } else if (this.peerConn.iceConnectionState == 'failed') {
this.hangup(CallErrorCode.IceFailed, false); this.hangup(CallErrorCode.IceFailed, false);
@@ -1099,10 +1098,12 @@ export class MatrixCall extends EventEmitter {
} }
} }
if (this.remoteStream) {
for (const track of this.remoteStream.getTracks()) { for (const track of this.remoteStream.getTracks()) {
track.stop(); track.stop();
} }
} }
}
private checkForErrorListener() { private checkForErrorListener() {
if (this.listeners("error").length === 0) { if (this.listeners("error").length === 0) {
@@ -1174,6 +1175,7 @@ export class MatrixCall extends EventEmitter {
iceServers: this.turnServers, iceServers: this.turnServers,
}); });
// 'connectionstatechange' would be better, but firefox doesn't implement that.
pc.addEventListener('iceconnectionstatechange', this.onIceConnectionStateChanged); pc.addEventListener('iceconnectionstatechange', this.onIceConnectionStateChanged);
pc.addEventListener('signalingstatechange', this.onSignallingStateChanged); pc.addEventListener('signalingstatechange', this.onSignallingStateChanged);
pc.addEventListener('icecandidate', this.gotLocalIceCandidate); pc.addEventListener('icecandidate', this.gotLocalIceCandidate);