BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screenshare: clean up getDisplayMedia method bindings

Browse Source
This commit is contained in:
prlanzarin 2021-01-12 11:40:54 -03:00
parent 077369c442
commit 25f5139973
1 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
bigbluebutton-html5/imports/api/screenshare/client/bridge/service.js
View File

@ -20,6 +20,14 @@ const hasDisplayMedia = (typeof navigator.getDisplayMedia === 'function'
const getConferenceBridge = () => Meetings.findOne().voiceProp.voiceConf; const getConferenceBridge = () => Meetings.findOne().voiceProp.voiceConf;
const getBoundGDM = () => {
if (typeof navigator.getDisplayMedia === 'function') {
return navigator.getDisplayMedia.bind(navigator);
} else if (navigator.mediaDevices && typeof navigator.mediaDevices.getDisplayMedia === 'function') {
return navigator.mediaDevices.getDisplayMedia.bind(navigator.mediaDevices);
}
}
const getScreenStream = async () => { const getScreenStream = async () => {
const gDMCallback = (stream) => { const gDMCallback = (stream) => {
// Some older Chromium variants choke on gDM when audio: true by NOT generating // Some older Chromium variants choke on gDM when audio: true by NOT generating
@ -34,10 +42,10 @@ const getScreenStream = async () => {
} }
if (typeof stream.getVideoTracks === 'function' if (typeof stream.getVideoTracks === 'function'
&& typeof constraints.video === 'object') { && typeof GDM_CONSTRAINTS.video === 'object') {
stream.getVideoTracks().forEach(track => { stream.getVideoTracks().forEach(track => {
if (typeof track.applyConstraints === 'function') { if (typeof track.applyConstraints === 'function') {
track.applyConstraints(constraints.video).catch(error => { track.applyConstraints(GDM_CONSTRAINTS.video).catch(error => {
logger.warn({ logger.warn({
logCode: 'screenshare_videoconstraint_failed', logCode: 'screenshare_videoconstraint_failed',
extraInfo: { errorName: error.name, errorCode: error.code }, extraInfo: { errorName: error.name, errorCode: error.code },
@ -49,10 +57,10 @@ const getScreenStream = async () => {
} }
if (typeof stream.getAudioTracks === 'function' if (typeof stream.getAudioTracks === 'function'
&& typeof constraints.audio === 'object') { && typeof GDM_CONSTRAINTS.audio === 'object') {
stream.getAudioTracks().forEach(track => { stream.getAudioTracks().forEach(track => {
if (typeof track.applyConstraints === 'function') { if (typeof track.applyConstraints === 'function') {
track.applyConstraints(constraints.audio).catch(error => { track.applyConstraints(GDM_CONSTRAINTS.audio).catch(error => {
logger.warn({ logger.warn({
logCode: 'screenshare_audioconstraint_failed', logCode: 'screenshare_audioconstraint_failed',
extraInfo: { errorName: error.name, errorCode: error.code }, extraInfo: { errorName: error.name, errorCode: error.code },
@ -65,32 +73,18 @@ const getScreenStream = async () => {
return Promise.resolve(stream); return Promise.resolve(stream);
} }
const constraints = hasDisplayMedia ? GDM_CONSTRAINTS : null; const getDisplayMedia = getBoundGDM();
if (hasDisplayMedia) { if (typeof getDisplayMedia === 'function') {
// The double checks here is to detect whether gDM is in navigator or mediaDevices return getDisplayMedia(GDM_CONSTRAINTS)
// because it can be on either of them depending on the browser+version .then(gDMCallback)
if (typeof navigator.getDisplayMedia === 'function') { .catch(error => {
return navigator.getDisplayMedia(constraints) logger.error({
.then(gDMCallback) logCode: 'screenshare_getdisplaymedia_failed',
.catch(error => { extraInfo: { errorName: error.name, errorCode: error.code },
logger.error({ }, 'getDisplayMedia call failed');
logCode: 'screenshare_getdisplaymedia_failed', return Promise.reject({ errorCode: error.code, errorMessage: error.name || error.message });
extraInfo: { errorName: error.name, errorCode: error.code }, });
}, 'getDisplayMedia call failed');
return Promise.reject({ errorCode: error.code, errorMessage: error.name || error.message });
});
} else if (navigator.mediaDevices && typeof navigator.mediaDevices.getDisplayMedia === 'function') {
return navigator.mediaDevices.getDisplayMedia(constraints)
.then(gDMCallback)
.catch(error => {
logger.error({
logCode: 'screenshare_getdisplaymedia_failed',
extraInfo: { errorName: error.name, errorCode: error.code },
}, 'getDisplayMedia call failed');
return Promise.reject({ errorCode: error.code, errorMessage: error.name || error.message });
});
}
} else { } else {
// getDisplayMedia isn't supported, error its way out // getDisplayMedia isn't supported, error its way out
return Promise.reject({ return Promise.reject({