matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-01 04:43:29 +03:00
Code Activity

Make localUsermediaStream into a getter

Browse Source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-08-02 21:28:49 +02:00
parent bc07ad5909
commit 4631cd1fe3
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/webrtc/call.ts
View File

@@ -278,7 +278,6 @@ export class MatrixCall extends EventEmitter {
private sentEndOfCandidates: boolean; private sentEndOfCandidates: boolean;
private peerConn: RTCPeerConnection; private peerConn: RTCPeerConnection;
private feeds: Array<CallFeed>; private feeds: Array<CallFeed>;
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;
@@ -404,6 +403,10 @@ export class MatrixCall extends EventEmitter {
return this.getLocalFeeds().find((feed) => feed.purpose === SDPStreamMetadataPurpose.Screenshare); return this.getLocalFeeds().find((feed) => feed.purpose === SDPStreamMetadataPurpose.Screenshare);
} }
public get localUsermediaStream(): MediaStream {
return this.localUsermediaFeed?.stream;
}
private get localScreenSharingStream(): MediaStream { private get localScreenSharingStream(): MediaStream {
return this.localScreenSharingFeed?.stream; return this.localScreenSharingFeed?.stream;
} }
@@ -728,11 +731,9 @@ export class MatrixCall extends EventEmitter {
} 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.localUsermediaStream); newCall.gotUserMediaForAnswer(this.localUsermediaStream);
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.localUsermediaStream); newCall.gotUserMediaForAnswer(this.localUsermediaStream);
delete(this.localUsermediaStream);
} }
this.successor = newCall; this.successor = newCall;
this.emit(CallEvent.Replaced, newCall); this.emit(CallEvent.Replaced, newCall);
@@ -1027,7 +1028,6 @@ export class MatrixCall extends EventEmitter {
return; return;
} }
this.localUsermediaStream = stream;
this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Usermedia); this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Usermedia);
this.setState(CallState.CreateOffer); this.setState(CallState.CreateOffer);
@@ -1090,7 +1090,6 @@ export class MatrixCall extends EventEmitter {
this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Usermedia); this.pushLocalFeed(stream, SDPStreamMetadataPurpose.Usermedia);
this.localUsermediaStream = stream;
logger.info("Got local AV stream with id " + this.localUsermediaStream.id); logger.info("Got local AV stream with id " + this.localUsermediaStream.id);
this.setState(CallState.CreateAnswer); this.setState(CallState.CreateAnswer);