mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2025-02-02 07:31:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #977 from vector-im/bwindels/fix-975

Browse Source 
Bwindels/fix 975
This commit is contained in:
Bruno Windels 2023-01-06 11:08:24 +00:00 committed by GitHub
commit 2d81a244be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/domain/session/room/CallViewModel.ts
View File

@ -136,7 +136,7 @@ class OwnMemberViewModel extends ViewModel<Options> implements IStreamViewModel
} }
get stream(): Stream | undefined { get stream(): Stream | undefined {
return this.call.localMedia?.userMedia; return this.call.localMedia?.userMediaPreview;
} }
private get call(): GroupCall { private get call(): GroupCall {

16
src/matrix/calls/LocalMedia.ts
View File

@ -20,11 +20,24 @@ import {SDPStreamMetadata} from "./callEventTypes";
import {getStreamVideoTrack, getStreamAudioTrack} from "./common"; import {getStreamVideoTrack, getStreamAudioTrack} from "./common";
export class LocalMedia { export class LocalMedia {
// the userMedia stream without audio, to play in the UI
// without our own audio being played back to us
public readonly userMediaPreview?: Stream;
constructor( constructor(
public readonly userMedia?: Stream, public readonly userMedia?: Stream,
public readonly screenShare?: Stream, public readonly screenShare?: Stream,
public readonly dataChannelOptions?: RTCDataChannelInit, public readonly dataChannelOptions?: RTCDataChannelInit,
) {} ) {
if (userMedia && userMedia.getVideoTracks().length > 0) {
this.userMediaPreview = userMedia.clone();
const audioTrack = getStreamAudioTrack(this.userMediaPreview);
if (audioTrack) {
audioTrack.stop();
this.userMediaPreview.removeTrack(audioTrack);
}
}
}
withUserMedia(stream: Stream) { withUserMedia(stream: Stream) {
return new LocalMedia(stream, this.screenShare, this.dataChannelOptions); return new LocalMedia(stream, this.screenShare, this.dataChannelOptions);
@ -63,6 +76,7 @@ export class LocalMedia {
dispose() { dispose() {
getStreamAudioTrack(this.userMedia)?.stop(); getStreamAudioTrack(this.userMedia)?.stop();
getStreamVideoTrack(this.userMedia)?.stop(); getStreamVideoTrack(this.userMedia)?.stop();
getStreamVideoTrack(this.userMediaPreview)?.stop();
getStreamVideoTrack(this.screenShare)?.stop(); getStreamVideoTrack(this.screenShare)?.stop();
} }
} }

2
src/matrix/calls/group/GroupCall.ts
View File

@ -216,8 +216,8 @@ export class GroupCall extends EventEmitter<{change: never}> {
// you might be muted because you don't have a track or because // you might be muted because you don't have a track or because
// you actively chosen to mute // you actively chosen to mute
// (which we want to respect in the future when you add a track) // (which we want to respect in the future when you add a track)
muteSettings.updateTrackInfo(joinedData.localMedia.userMedia);
joinedData.localMuteSettings = muteSettings; joinedData.localMuteSettings = muteSettings;
joinedData.localMuteSettings.updateTrackInfo(joinedData.localMedia.userMedia);
if (!prevMuteSettings.equals(muteSettings)) { if (!prevMuteSettings.equals(muteSettings)) {
await Promise.all(Array.from(this._members.values()).map(m => { await Promise.all(Array.from(this._members.values()).map(m => {
return m.setMuted(joinedData.localMuteSettings); return m.setMuted(joinedData.localMuteSettings);