Commit 2bd7fbb

authored

Merge pull request meetecho#1518 from cb22/navigator-getdisplaymedia

Update janus.js to use navigator.mediaDevices.getDisplayMedia

2 parents 5b2eadb + 4988fed commit 2bd7fbbCopy full SHA for 2bd7fbb

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`Janus.sessions = {};`
`27`	`27`
`28`	`28`	`Janus.isExtensionEnabled = function() {`
`29`		`- if(navigator.getDisplayMedia) {`
	`29`	`+ if(navigator.mediaDevices&&navigator.mediaDevices.getDisplayMedia) {`
`30`	`30`	`// No need for the extension, getDisplayMedia is supported`
`31`	`31`	`return true;`
`32`	`32`	`}`
`@@ -2060,11 +2060,11 @@ function Janus(gatewayCallbacks) {`
`2060`	`2060`	`if(!media.screenshareFrameRate) {`
`2061`	`2061`	`media.screenshareFrameRate = 3;`
`2062`	`2062`	`}`
`2063`		`- if(navigator.getDisplayMedia) {`
	`2063`	`+ if(navigator.mediaDevices&&navigator.mediaDevices.getDisplayMedia) {`
`2064`	`2064`	`// The new experimental getDisplayMedia API is available, let's use that`
`2065`	`2065`	`// https://groups.google.com/forum/#!topic/discuss-webrtc/Uf0SrR4uxzk`
`2066`	`2066`	`// https://webrtchacks.com/chrome-screensharing-getdisplaymedia/`
`2067`		`- navigator.getDisplayMedia({ video: true })`
	`2067`	`+ navigator.mediaDevices.getDisplayMedia({ video: true })`
`2068`	`2068`	`.then(function(stream) {`
`2069`	`2069`	`pluginHandle.consentDialog(false);`
`2070`	`2070`	`if(isAudioSendEnabled(media) && !media.keepAudio) {`

Comments

(0)