matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-07-31 15:24:23 +03:00
Code Activity

Test fallback screensharing (#2659)

Browse Source 
* Test fallback screensharing

* Test replacetrack is called

* Unused import

* Return type

* Fix other test after new track IDs
This commit is contained in:
David Baker
2022-09-09 21:15:34 +01:00
committed by GitHub
parent 02f6a09bcf
commit 00629e6dc9
2 changed files with 70 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spec/test-utils/webrtc.ts
View File

@ -104,13 +104,18 @@ export class MockRTCPeerConnection {
private onReadyToNegotiate: () => void;
localDescription: RTCSessionDescription;
signalingState: RTCSignalingState = "stable";
public senders: MockRTCRtpSender[] = [];
public static triggerAllNegotiations() {
public static triggerAllNegotiations(): void {
for (const inst of this.instances) {
inst.doNegotiation();
}
}
public static hasAnyPendingNegotiations(): boolean {
return this.instances.some(i => i.needsNegotiation);
}
public static resetInstances() {
this.instances = [];
}
@ -153,10 +158,12 @@ export class MockRTCPeerConnection {
}
close() { }
getStats() { return []; }
addTrack(track: MockMediaStreamTrack) {
addTrack(track: MockMediaStreamTrack): MockRTCRtpSender {
this.needsNegotiation = true;
this.onReadyToNegotiate();
return new MockRTCRtpSender(track);
const newSender = new MockRTCRtpSender(track);
this.senders.push(newSender);
return newSender;
}
removeTrack() {
@ -164,6 +171,8 @@ export class MockRTCPeerConnection {
this.onReadyToNegotiate();
}
getSenders(): MockRTCRtpSender[] { return this.senders; }
doNegotiation() {
if (this.needsNegotiation && this.negotiationNeededListener) {
this.needsNegotiation = false;
@ -271,8 +280,8 @@ export class MockMediaHandler {
getUserMediaStream(audio: boolean, video: boolean) {
const tracks = [];
if (audio) tracks.push(new MockMediaStreamTrack("audio_track", "audio"));
if (video) tracks.push(new MockMediaStreamTrack("video_track", "video"));
if (audio) tracks.push(new MockMediaStreamTrack("usermedia_audio_track", "audio"));
if (video) tracks.push(new MockMediaStreamTrack("usermedia_video_track", "video"));
const stream = new MockMediaStream(USERMEDIA_STREAM_ID, tracks);
this.userMediaStreams.push(stream);
@ -282,8 +291,8 @@ export class MockMediaHandler {
stream.isStopped = true;
}
getScreensharingStream = jest.fn((opts?: IScreensharingOpts) => {
const tracks = [new MockMediaStreamTrack("video_track", "video")];
if (opts?.audio) tracks.push(new MockMediaStreamTrack("audio_track", "audio"));
const tracks = [new MockMediaStreamTrack("screenshare_video_track", "video")];
if (opts?.audio) tracks.push(new MockMediaStreamTrack("screenshare_audio_track", "audio"));
const stream = new MockMediaStream(SCREENSHARE_STREAM_ID, tracks);
this.screensharingStreams.push(stream);

62
spec/unit/webrtc/call.spec.ts
View File

@ -389,14 +389,14 @@ describe('Call', function() {
const usermediaSenders: Array<RTCRtpSender> = (call as any).usermediaSenders;
expect(call.localUsermediaStream.getAudioTracks()[0].id).toBe("audio_track");
expect(call.localUsermediaStream.getVideoTracks()[0].id).toBe("video_track");
expect(call.localUsermediaStream.getAudioTracks()[0].id).toBe("usermedia_audio_track");
expect(call.localUsermediaStream.getVideoTracks()[0].id).toBe("usermedia_video_track");
expect(usermediaSenders.find((sender) => {
return sender?.track?.kind === "audio";
}).track.id).toBe("audio_track");
}).track.id).toBe("usermedia_audio_track");
expect(usermediaSenders.find((sender) => {
return sender?.track?.kind === "video";
}).track.id).toBe("video_track");
}).track.id).toBe("usermedia_video_track");
});
it("should handle SDPStreamMetadata changes", async () => {
@ -925,8 +925,8 @@ describe('Call', function() {
await call.setScreensharingEnabled(true);
expect(
call.getLocalFeeds().filter(f => f.purpose == SDPStreamMetadataPurpose.Screenshare).length,
).toEqual(1);
call.getLocalFeeds().filter(f => f.purpose == SDPStreamMetadataPurpose.Screenshare),
).toHaveLength(1);
mockSendEvent.mockReset();
const sendNegotiatePromise = new Promise<void>(resolve => {
@ -954,9 +954,55 @@ describe('Call', function() {
await call.setScreensharingEnabled(false);
expect(
call.getLocalFeeds().filter(f => f.purpose == SDPStreamMetadataPurpose.Screenshare),
).toHaveLength(0);
});
});
it("falls back to replaceTrack for opponents that don't support stream metadata", async () => {
await startVideoCall(client, call);
await call.onAnswerReceived(makeMockEvent("@test:foo", {
"version": 1,
"call_id": call.callId,
"party_id": 'party_id',
"answer": {
sdp: DUMMY_SDP,
},
}));
MockRTCPeerConnection.triggerAllNegotiations();
const mockVideoSender = call.peerConn.getSenders().find(s => s.track.kind === "video");
const mockReplaceTrack = mockVideoSender.replaceTrack = jest.fn();
await call.setScreensharingEnabled(true);
// our local feed should still reflect the purpose of the feed (ie. screenshare)
expect(
call.getLocalFeeds().filter(f => f.purpose == SDPStreamMetadataPurpose.Screenshare).length,
).toEqual(0);
});
).toEqual(1);
// but we should not have re-negotiated
expect(MockRTCPeerConnection.hasAnyPendingNegotiations()).toEqual(false);
expect(mockReplaceTrack).toHaveBeenCalledWith(expect.objectContaining({
id: "screenshare_video_track",
}));
mockReplaceTrack.mockClear();
await call.setScreensharingEnabled(false);
expect(
call.getLocalFeeds().filter(f => f.purpose == SDPStreamMetadataPurpose.Screenshare),
).toHaveLength(0);
expect(call.getLocalFeeds()).toHaveLength(1);
expect(MockRTCPeerConnection.hasAnyPendingNegotiations()).toEqual(false);
expect(mockReplaceTrack).toHaveBeenCalledWith(expect.objectContaining({
id: "usermedia_video_track",
}));
});
});