Enabling GetDisplayMedia for screensharing (lynckia#1468)

Arri98 · Oct 3, 2019 · bf1aa82 · bf1aa82
1 parent 8400cb8
commit bf1aa82
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/erizo_controller/erizoClient/src/utils/ConnectionHelpers.js b/erizo_controller/erizoClient/src/utils/ConnectionHelpers.js
@@ -29,8 +29,11 @@ const GetUserMedia = (config, callback = () => {}, error = () => {}) => {
     navigator.mediaDevices.getUserMedia(userMediaConfig).then(cb).catch(errorCb);
   };
 
+  const getDisplayMedia = (userMediaConfig, cb, errorCb) => {
+    navigator.mediaDevices.getDisplayMedia(userMediaConfig).then(cb).catch(errorCb);
+  };
+
   const configureScreensharing = () => {
-    Logger.debug('Screen access requested');
     switch (getBrowser()) {
       case 'electron' :
         Logger.debug('Screen sharing in Electron');
@@ -110,7 +113,13 @@ const GetUserMedia = (config, callback = () => {}, error = () => {}) => {
   };
 
   if (config.screen) {
-    configureScreensharing();
+    if (config.desktopStreamId || config.extensionId) {
+      Logger.debug('Screen access requested using GetUserMedia');
+      configureScreensharing();
+    } else {
+      Logger.debug('Screen access requested using GetDisplayMedia');
+      getDisplayMedia(config, callback, error);
+    }
   } else if (typeof module !== 'undefined' && module.exports) {
     Logger.error('Video/audio streams not supported in erizofc yet');
   } else {