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

WIP: prevent stream id from changing when upgrading call

Browse source
This commit is contained in:
Bruno Windels 2022-07-05 18:22:36 +02:00
parent 5527e2b22c
commit 206ac6e2dd
3 changed files with 53 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/matrix/calls/PeerCall.ts
View file

@ -999,49 +999,55 @@ export class PeerCall implements IDisposable {
private updateLocalMedia(localMedia: LocalMedia, logItem: ILogItem): Promise<void> { private updateLocalMedia(localMedia: LocalMedia, logItem: ILogItem): Promise<void> {
return logItem.wrap("updateLocalMedia", async log => { return logItem.wrap("updateLocalMedia", async log => {
const oldMedia = this.localMedia; const senders = this.peerConnection.getSenders();
this.localMedia = localMedia;
const applyStream = async (oldStream: Stream | undefined, stream: Stream | undefined, streamPurpose: SDPStreamMetadataPurpose) => { const applyStream = async (oldStream: Stream | undefined, stream: Stream | undefined, streamPurpose: SDPStreamMetadataPurpose) => {
const applyTrack = async (oldTrack: Track | undefined, newTrack: Track | undefined) => { const applyTrack = async (oldTrack: Track | undefined, newTrack: Track | undefined) => {
if (!oldTrack && newTrack) { const oldSender = senders.find(s => s.track === oldTrack);
log.wrap(`adding ${streamPurpose} ${newTrack.kind} track`, log => { const streamToKeep = (oldStream ?? stream)!;
const sender = this.peerConnection.addTrack(newTrack, stream!); if (streamToKeep !== stream) {
this.options.webRTC.prepareSenderForPurpose(this.peerConnection, sender, streamPurpose); if (oldTrack) {
}); streamToKeep.removeTrack(oldTrack);
} else if (oldTrack) { }
const sender = this.peerConnection.getSenders().find(s => s.track && s.track.id === oldTrack.id); if (newTrack) {
if (sender) { streamToKeep.addTrack(newTrack);
if (newTrack && oldTrack.id !== newTrack.id) { }
}
if (newTrack && oldSender) {
try { try {
await log.wrap(`replacing ${streamPurpose} ${newTrack.kind} track`, log => { await log.wrap(`attempting to replace ${streamPurpose} ${newTrack.kind} track`, log => {
return sender.replaceTrack(newTrack); return oldSender.replaceTrack(newTrack);
}); });
} catch (err) { // replaceTrack succeeded, nothing left to do
// can't replace the track without renegotiating{ return;
log.wrap(`adding and removing ${streamPurpose} ${newTrack.kind} track`, log => { } catch (err) {}
this.peerConnection.removeTrack(sender); }
const newSender = this.peerConnection.addTrack(newTrack); if(oldSender) {
log.wrap(`removing ${streamPurpose} ${oldSender.track!.kind} track`, log => {
this.peerConnection.removeTrack(oldSender);
});
}
if (newTrack) {
log.wrap(`adding ${streamPurpose} ${newTrack.kind} track`, log => {
const newSender = this.peerConnection.addTrack(newTrack, streamToKeep);
this.options.webRTC.prepareSenderForPurpose(this.peerConnection, newSender, streamPurpose); this.options.webRTC.prepareSenderForPurpose(this.peerConnection, newSender, streamPurpose);
}); });
} }
} else if (!newTrack) {
log.wrap(`removing ${streamPurpose} ${sender.track!.kind} track`, log => {
this.peerConnection.removeTrack(sender);
});
} else {
log.log(`${streamPurpose} ${oldTrack.kind} track hasn't changed`);
} }
if (!oldStream && !stream) {
return;
} }
// TODO: should we do something if we didn't find the sender? e.g. some other code already removed the sender but didn't update localMedia
}
}
await applyTrack(getStreamAudioTrack(oldStream), getStreamAudioTrack(stream)); await applyTrack(getStreamAudioTrack(oldStream), getStreamAudioTrack(stream));
await applyTrack(getStreamVideoTrack(oldStream), getStreamVideoTrack(stream)); await applyTrack(getStreamVideoTrack(oldStream), getStreamVideoTrack(stream));
}; };
await applyStream(oldMedia?.userMedia, localMedia?.userMedia, SDPStreamMetadataPurpose.Usermedia); await applyStream(this.localMedia?.userMedia, localMedia?.userMedia, SDPStreamMetadataPurpose.Usermedia);
await applyStream(oldMedia?.screenShare, localMedia?.screenShare, SDPStreamMetadataPurpose.Screenshare); await applyStream(this.localMedia?.screenShare, localMedia?.screenShare, SDPStreamMetadataPurpose.Screenshare);
// we explicitly don't replace this.localMedia if already set
// as we need to keep the old stream so the stream id doesn't change
// instead we add and remove tracks in the stream in applyTrack
if (!this.localMedia) {
this.localMedia = localMedia;
}
// TODO: datachannel, but don't do it here as we don't want to do it from answer, rather in different method // TODO: datachannel, but don't do it here as we don't want to do it from answer, rather in different method
}); });
} }
@ -1158,3 +1164,13 @@ function enableTransceiver(transceiver: Transceiver, enabled: boolean, exclusive
} }
} }
} }
/**
* tests to write:
*
* upgradeCall: adding a track with setMedia calls the correct methods on the peerConnection
* upgradeCall: removing a track with setMedia calls the correct methods on the peerConnection
* upgradeCall: replacing compatible track with setMedia calls the correct methods on the peerConnection
* upgradeCall: replacing incompatible track (sender.replaceTrack throws) with setMedia calls the correct methods on the peerConnection
*
* */

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

@ -293,6 +293,7 @@ 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);
} }

2
src/platform/types/MediaDevices.ts
View file

@ -56,6 +56,8 @@ export interface Stream {
clone(): Stream; clone(): Stream;
addEventListener<K extends keyof StreamEventMap>(type: K, listener: (this: Stream, ev: StreamEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void; addEventListener<K extends keyof StreamEventMap>(type: K, listener: (this: Stream, ev: StreamEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
removeEventListener<K extends keyof StreamEventMap>(type: K, listener: (this: Stream, ev: StreamEventMap[K]) => any, options?: boolean | EventListenerOptions): void; removeEventListener<K extends keyof StreamEventMap>(type: K, listener: (this: Stream, ev: StreamEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
addTrack(track: Track);
removeTrack(track: Track);
} }
export enum TrackKind { export enum TrackKind {