Fixed DetectRTC captureStream detection.

muaz-khan · Nov 12, 2016 · bf1ad7f · bf1ad7f
1 parent 65a450d
commit bf1ad7f
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 6 deletions.
diff --git a/DetectRTC.js b/DetectRTC.js
@@ -1,4 +1,4 @@
-// Last time updated: 2016-11-02 8:56:06 AM UTC
+// Last time updated: 2016-11-12 6:02:08 AM UTC
 
 // Latest file can be found here: https://cdn.webrtc-experiment.com/DetectRTC.js
 
@@ -894,6 +894,16 @@
     DetectRTC.isCanvasSupportsStreamCapturing = isCanvasSupportsStreamCapturing;
     DetectRTC.isVideoSupportsStreamCapturing = isVideoSupportsStreamCapturing;
 
+    if (DetectRTC.browser.name == 'Chrome' && DetectRTC.browser.version >= 53) {
+        if (!DetectRTC.isCanvasSupportsStreamCapturing) {
+            DetectRTC.isCanvasSupportsStreamCapturing = 'Requires chrome flag: enable-experimental-web-platform-features';
+        }
+
+        if (!DetectRTC.isVideoSupportsStreamCapturing) {
+            DetectRTC.isVideoSupportsStreamCapturing = 'Requires chrome flag: enable-experimental-web-platform-features';
+        }
+    }
+
     // ------
     DetectRTC.DetectLocalIPAddress = DetectLocalIPAddress;
 

diff --git a/DetectRTC.min.js b/DetectRTC.min.js
diff --git a/dev/DetectRTC.js b/dev/DetectRTC.js
@@ -114,6 +114,16 @@ DetectRTC.displayResolution = displayResolution;
 DetectRTC.isCanvasSupportsStreamCapturing = isCanvasSupportsStreamCapturing;
 DetectRTC.isVideoSupportsStreamCapturing = isVideoSupportsStreamCapturing;
 
+if (DetectRTC.browser.name == 'Chrome' && DetectRTC.browser.version >= 53) {
+    if (!DetectRTC.isCanvasSupportsStreamCapturing) {
+        DetectRTC.isCanvasSupportsStreamCapturing = 'Requires chrome flag: enable-experimental-web-platform-features';
+    }
+
+    if (!DetectRTC.isVideoSupportsStreamCapturing) {
+        DetectRTC.isVideoSupportsStreamCapturing = 'Requires chrome flag: enable-experimental-web-platform-features';
+    }
+}
+
 // ------
 DetectRTC.DetectLocalIPAddress = DetectLocalIPAddress;
 

diff --git a/index.html b/index.html
@@ -149,6 +149,10 @@ <h2 id="welcome">DetectRTC!</h2>
                     return tr;
                 }
 
+                window.onerror = console.error = function() {
+                    appendTR('Error', JSON.stringify(arguments), 'error');
+                };
+
                 function printVal(value) {
                     return value == true ? 'Yep' : value == false ? 'Nope' : value;
                 }
@@ -329,10 +333,27 @@ <h2 id="welcome">DetectRTC!</h2>
                 DetectRTC.load(function() {
                     reloadDetectRTC();
 
-                    if(DetectRTC.MediaDevices[0] && DetectRTC.MediaDevices[0].label === 'Please invoke getUserMedia once.') {
-                        navigator.mediaDevices.getUserMedia({audio: true, video: true}).then(reloadDetectRTC).catch(reloadDetectRTC);
-                        return;
+                    try {
+                        if(DetectRTC.MediaDevices[0] && DetectRTC.MediaDevices[0].label === 'Please invoke getUserMedia once.') {
+                            navigator.mediaDevices.getUserMedia({audio: true, video: true}).then(function(stream) {
+                                reloadDetectRTC();
+
+                                try {
+                                    // release camera
+                                    stream.getVideoTracks().forEach(function(track) {
+                                        track.stop();
+                                    });
+
+                                    stream.getAudioTracks().forEach(function(track) {
+                                        track.stop();
+                                    });
+                                }
+                                catch(e) {}
+                            }).catch(reloadDetectRTC);
+                            return;
+                        }
                     }
+                    catch(e) {}
 
                     onDetectRTCLoaded();
                 });