mystiq/hydrogen-web
Archived
4
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

clone localMedia in Member when connection, like we do for setMedia

Browse source
This commit is contained in:
Bruno Windels 2022-07-07 15:36:49 +02:00
parent f187a51c97
commit 2f08cd8984
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/matrix/calls/group/GroupCall.ts
View file

@ -510,8 +510,7 @@ export class GroupCall extends EventEmitter<{change: never}> {
const logItem = joinedData.membersLogItem.child({l: "member", id: memberKey}); const logItem = joinedData.membersLogItem.child({l: "member", id: memberKey});
logItem.set("sessionId", member.sessionId); logItem.set("sessionId", member.sessionId);
log.wrap({l: "connect", id: memberKey}, log => { log.wrap({l: "connect", id: memberKey}, log => {
// Safari can't send a MediaStream to multiple sources, so clone it const connectItem = member.connect(joinedData.localMedia, joinedData.localMuteSettings, logItem);
const connectItem = member.connect(joinedData.localMedia.clone(), joinedData.localMuteSettings, logItem);
if (connectItem) { if (connectItem) {
log.refDetached(connectItem); log.refDetached(connectItem);
} }

4
src/matrix/calls/group/Member.ts
View file

@ -116,7 +116,8 @@ export class Member {
if (this.connection) { if (this.connection) {
return; return;
} }
const connection = new MemberConnection(localMedia, localMuteSettings, memberLogItem); // Safari can't send a MediaStream to multiple sources, so clone it
const connection = new MemberConnection(localMedia.clone(), localMuteSettings, memberLogItem);
this.connection = connection; this.connection = connection;
let connectLogItem; let connectLogItem;
connection.logItem.wrap("connect", async log => { connection.logItem.wrap("connect", async log => {
@ -293,7 +294,6 @@ export class Member {
async setMedia(localMedia: LocalMedia, previousMedia: LocalMedia): Promise<void> { async setMedia(localMedia: LocalMedia, previousMedia: LocalMedia): Promise<void> {
const {connection} = this; const {connection} = this;
if (connection) { if (connection) {
// TODO: see if we can simplify this
connection.localMedia = localMedia.replaceClone(connection.localMedia, previousMedia); connection.localMedia = localMedia.replaceClone(connection.localMedia, previousMedia);
await connection.peerCall?.setMedia(connection.localMedia, connection.logItem); await connection.peerCall?.setMedia(connection.localMedia, connection.logItem);
} }