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

localAVStream -> localUsermediaStream

Browse Source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-08-02 21:02:09 +02:00
parent 529fe93ab1
commit 1e281f6838
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/webrtc/call.ts
View File

@@ -279,7 +279,7 @@ export class MatrixCall extends EventEmitter {
private feeds: Array<CallFeed>; private feeds: Array<CallFeed>;
private screenSharingStream: MediaStream; private screenSharingStream: MediaStream;
// TODO: Rename to usermedia rather than AV for consistency // TODO: Rename to usermedia rather than AV for consistency
private localAVStream: MediaStream; private localUsermediaStream: MediaStream;
private usermediaSenders: Array<RTCRtpSender>; private usermediaSenders: Array<RTCRtpSender>;
private screensharingSenders: Array<RTCRtpSender>; private screensharingSenders: Array<RTCRtpSender>;
private inviteOrAnswerSent: boolean; private inviteOrAnswerSent: boolean;
@@ -676,7 +676,7 @@ export class MatrixCall extends EventEmitter {
logger.debug(`Answering call ${this.callId} of type ${this.type}`); logger.debug(`Answering call ${this.callId} of type ${this.type}`);
if (!this.localAVStream && !this.waitForLocalAVStream) { if (!this.localUsermediaStream && !this.waitForLocalAVStream) {
const constraints = getUserMediaContraints( const constraints = getUserMediaContraints(
this.type == CallType.Video ? this.type == CallType.Video ?
ConstraintsType.Video: ConstraintsType.Video:
@@ -694,8 +694,8 @@ export class MatrixCall extends EventEmitter {
this.getUserMediaFailed(e); this.getUserMediaFailed(e);
return; return;
} }
} else if (this.localAVStream) { } else if (this.localUsermediaStream) {
this.gotUserMediaForAnswer(this.localAVStream); this.gotUserMediaForAnswer(this.localUsermediaStream);
} else if (this.waitForLocalAVStream) { } else if (this.waitForLocalAVStream) {
this.setState(CallState.WaitLocalMedia); this.setState(CallState.WaitLocalMedia);
} }
@@ -713,12 +713,12 @@ export class MatrixCall extends EventEmitter {
newCall.waitForLocalAVStream = true; newCall.waitForLocalAVStream = true;
} else if (this.state === CallState.CreateOffer) { } else if (this.state === CallState.CreateOffer) {
logger.debug("Handing local stream to new call"); logger.debug("Handing local stream to new call");
newCall.gotUserMediaForAnswer(this.localAVStream); newCall.gotUserMediaForAnswer(this.localUsermediaStream);
delete(this.localAVStream); delete(this.localUsermediaStream);
} else if (this.state === CallState.InviteSent) { } else if (this.state === CallState.InviteSent) {
logger.debug("Handing local stream to new call"); logger.debug("Handing local stream to new call");
newCall.gotUserMediaForAnswer(this.localAVStream); newCall.gotUserMediaForAnswer(this.localUsermediaStream);
delete(this.localAVStream); delete(this.localUsermediaStream);
} }
this.successor = newCall; this.successor = newCall;
this.emit(CallEvent.Replaced, newCall); this.emit(CallEvent.Replaced, newCall);
@@ -868,7 +868,7 @@ export class MatrixCall extends EventEmitter {
return false; return false;
} }
} else { } else {
const track = this.localAVStream.getTracks().find((track) => { const track = this.localUsermediaStream.getTracks().find((track) => {
return track.kind === "video"; return track.kind === "video";
}); });
const sender = this.usermediaSenders.find((sender) => { const sender = this.usermediaSenders.find((sender) => {
@@ -991,15 +991,15 @@ export class MatrixCall extends EventEmitter {
} }
private updateMuteStatus() { private updateMuteStatus() {
if (!this.localAVStream) { if (!this.localUsermediaStream) {
return; return;
} }
const micShouldBeMuted = this.micMuted || this.remoteOnHold; const micShouldBeMuted = this.micMuted || this.remoteOnHold;
setTracksEnabled(this.localAVStream.getAudioTracks(), !micShouldBeMuted); setTracksEnabled(this.localUsermediaStream.getAudioTracks(), !micShouldBeMuted);
const vidShouldBeMuted = this.vidMuted || this.remoteOnHold; const vidShouldBeMuted = this.vidMuted || this.remoteOnHold;
setTracksEnabled(this.localAVStream.getVideoTracks(), !vidShouldBeMuted); setTracksEnabled(this.localUsermediaStream.getVideoTracks(), !vidShouldBeMuted);
} }
/** /**
@@ -1016,11 +1016,11 @@ export class MatrixCall extends EventEmitter {
return; return;
} }
this.localAVStream = stream; this.localUsermediaStream = stream;
this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Usermedia); this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Usermedia);
this.setState(CallState.CreateOffer); this.setState(CallState.CreateOffer);
logger.info("Got local AV stream with id " + this.localAVStream.id); logger.info("Got local AV stream with id " + this.localUsermediaStream.id);
logger.debug("gotUserMediaForInvite -> " + this.type); logger.debug("gotUserMediaForInvite -> " + this.type);
// Now we wait for the negotiationneeded event // Now we wait for the negotiationneeded event
}; };
@@ -1079,8 +1079,8 @@ export class MatrixCall extends EventEmitter {
this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Usermedia); this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Usermedia);
this.localAVStream = stream; this.localUsermediaStream = stream;
logger.info("Got local AV stream with id " + this.localAVStream.id); logger.info("Got local AV stream with id " + this.localUsermediaStream.id);
this.setState(CallState.CreateAnswer); this.setState(CallState.CreateAnswer);
@@ -1731,7 +1731,7 @@ export class MatrixCall extends EventEmitter {
} }
private stopAllMedia() { private stopAllMedia() {
logger.debug(`stopAllMedia (stream=${this.localAVStream})`); logger.debug(`stopAllMedia (stream=${this.localUsermediaStream})`);
for (const feed of this.feeds) { for (const feed of this.feeds) {
for (const track of feed.stream.getTracks()) { for (const track of feed.stream.getTracks()) {