Skip to content

Commit

Permalink
Merge pull request #1148 from webrtcHacks/remove-old-getdisplaymedia
Browse files Browse the repository at this point in the history
Remove Chrome getDisplayMedia shim
  • Loading branch information
fippo committed Mar 24, 2024
2 parents 13c8980 + fdf88a4 commit 1868c93
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 147 deletions.
1 change: 0 additions & 1 deletion src/js/chrome/chrome_shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import * as utils from '../utils.js';

export {shimGetUserMedia} from './getusermedia';
export {shimGetDisplayMedia} from './getdisplaymedia';

export function shimMediaStream(window) {
window.MediaStream = window.MediaStream || window.webkitMediaStream;
Expand Down
50 changes: 0 additions & 50 deletions src/js/chrome/getdisplaymedia.js

This file was deleted.

96 changes: 0 additions & 96 deletions test/unit/chrome.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,100 +60,4 @@ describe('Chrome shim', () => {
shim.shimGetUserMedia(window);
});
});

describe('getDisplayMedia shim', () => {
const getSourceId = jest.fn().mockReturnValue(Promise.resolve('abc'));

it('does not overwrite an existing ' +
'navigator.mediaDevices.getDisplayMedia', () => {
window.navigator.mediaDevices.getDisplayMedia = 'foo';
shim.shimGetDisplayMedia(window, getSourceId);
expect(window.navigator.mediaDevices.getDisplayMedia).toBe('foo');
});

it('does not if navigator.mediaDevices does not exist', () => {
delete window.navigator.mediaDevices;
shim.shimGetDisplayMedia(window);
expect(window.navigator.mediaDevices).toBe(undefined);
});

it('shims navigator.mediaDevices.getDisplayMedia', () => {
shim.shimGetDisplayMedia(window, getSourceId);
expect(typeof window.navigator.mediaDevices.getDisplayMedia)
.toBe('function');
});

it('calls getUserMedia with the sourceId', async() => {
shim.shimGetDisplayMedia(window, getSourceId);
await window.navigator.mediaDevices.getDisplayMedia({video: true});
expect(window.navigator.mediaDevices.getUserMedia.mock.calls.length)
.toBe(1);
expect(window.navigator.mediaDevices.getUserMedia.mock.calls[0][0])
.toEqual({
video: {
mandatory: {
chromeMediaSource: 'desktop',
chromeMediaSourceId: 'abc',
maxFrameRate: 3,
}
}
});
});

it('translates frameRate to legacy maxFrameRate', async() => {
shim.shimGetDisplayMedia(window, getSourceId);
await window.navigator.mediaDevices
.getDisplayMedia({video: {frameRate: 25}});
expect(window.navigator.mediaDevices.getUserMedia.mock.calls.length)
.toBe(1);
expect(window.navigator.mediaDevices.getUserMedia.mock.calls[0][0])
.toEqual({
video: {
mandatory: {
chromeMediaSource: 'desktop',
chromeMediaSourceId: 'abc',
maxFrameRate: 25,
}
}
});
});

it('translates width to legacy maxWidth', async() => {
shim.shimGetDisplayMedia(window, getSourceId);
await window.navigator.mediaDevices
.getDisplayMedia({video: {width: 640}});
expect(window.navigator.mediaDevices.getUserMedia.mock.calls.length)
.toBe(1);
expect(window.navigator.mediaDevices.getUserMedia.mock.calls[0][0])
.toEqual({
video: {
mandatory: {
chromeMediaSource: 'desktop',
chromeMediaSourceId: 'abc',
maxFrameRate: 3,
maxWidth: 640,
}
}
});
});

it('translates height to legacy maxHeight', async() => {
shim.shimGetDisplayMedia(window, getSourceId);
await window.navigator.mediaDevices
.getDisplayMedia({video: {height: 480}});
expect(window.navigator.mediaDevices.getUserMedia.mock.calls.length)
.toBe(1);
expect(window.navigator.mediaDevices.getUserMedia.mock.calls[0][0])
.toEqual({
video: {
mandatory: {
chromeMediaSource: 'desktop',
chromeMediaSourceId: 'abc',
maxFrameRate: 3,
maxHeight: 480,
}
}
});
});
});
});

0 comments on commit 1868c93

Please sign in to comment.