Merge pull request #512 from jmlacroix/fix-demo-screenid

Replace getScreenId call with getDisplayMedia
muaz-khan · May 3, 2019 · 3aceba7 · 3aceba7
2 parents b3ad9a0 + fd2553f
commit 3aceba7
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/simple-demos/record-cropped-screen.html b/simple-demos/record-cropped-screen.html
@@ -126,22 +126,34 @@ <h1>Record Cropped Screen using <a href="https://github.com/muaz-khan/RecordRTC"
 
 var recorder;
 
-function captureScreen(cb) {
-    getScreenId(function(error, sourceId, screen_constraints) {
-        navigator.mediaDevices.getUserMedia(screen_constraints).then(cb).catch(function(error) {
-            console.error('getScreenId error', error);
-
-            alert('Failed to capture your screen. Please check Chrome console logs for further information.');
+function getScreenStream(callback) {
+    if (navigator.getDisplayMedia) {
+        navigator.getDisplayMedia({
+            video: true
+        }).then(screenStream => {
+            callback(screenStream);
         });
-    });
+    } else if (navigator.mediaDevices.getDisplayMedia) {
+        navigator.mediaDevices.getDisplayMedia({
+            video: true
+        }).then(screenStream => {
+            callback(screenStream);
+        });
+    } else {
+        getScreenId(function(error, sourceId, screen_constraints) {
+            navigator.mediaDevices.getUserMedia(screen_constraints).then(function(screenStream) {
+                callback(screenStream);
+            });
+        });
+    }
 }
 
 var mediaElement = document.querySelector('#mediaElement');
 
 document.querySelector('#btn-start-recording').onclick = function() {
     document.querySelector('#btn-start-recording').style.display = 'none';
 
-    captureScreen(function(screen) {
+    getScreenStream(function(screen) {
         var inited = false;
 
         mediaElement.ontimeupdate = function(ev) {