Added support for "Screen Capturing on Android"

muaz-khan · Nov 7, 2016 · b856c9c · b856c9c
1 parent 67bb09a
commit b856c9c
Show file tree

Hide file tree

Showing 9 changed files with 144 additions and 22 deletions.
diff --git a/demos/file-sharing.html b/demos/file-sharing.html
@@ -372,10 +372,10 @@
                 connection.fileReceived = {};
 
                 // by default, socket.io server is assumed to be deployed on your own URL
-                // connection.socketURL = '/';
+                connection.socketURL = '/';
 
                 // comment-out below line if you do not have your own socket.io server
-                connection.socketURL = 'https://rtcmulticonnection.herokuapp.com:443/';
+                // connection.socketURL = 'https://rtcmulticonnection.herokuapp.com:443/';
 
                 connection.socketMessageEvent = 'file-sharing-demo';
 

diff --git a/dev/MultiPeersHandler.js b/dev/MultiPeersHandler.js
@@ -171,7 +171,9 @@ function MultiPeers(connection) {
                 self.onDataChannelClosed(event, remoteUserId);
             },
             onRemoteStream: function(stream) {
-                connection.peers[remoteUserId].streams.push(stream);
+                if (connection.peers[remoteUserId]) {
+                    connection.peers[remoteUserId].streams.push(stream);
+                }
 
                 if (isPluginRTC && window.PluginRTC) {
                     var mediaElement = document.createElement('video');

diff --git a/dev/RTCPeerConnection.js b/dev/RTCPeerConnection.js
@@ -218,6 +218,7 @@ function PeerInitiator(config) {
 
     var streamObject;
     peer.addEventListener(remoteStreamAddEvent, function(event) {
+        if (!event) return;
         if (event.streams && event.streams.length && !event.stream) {
             if (!streamObject) {
                 streamObject = new MediaStream();

diff --git a/dev/Screen-Capturing.js b/dev/Screen-Capturing.js
@@ -1,4 +1,4 @@
-// Last time updated at Sep 01, 2016, 08:32:23
+// Last time updated at Nov 07, 2016, 08:32:23
 
 // Latest file can be found here: https://cdn.webrtc-experiment.com/Screen-Capturing.js
 
@@ -21,6 +21,15 @@ window.addEventListener('message', function(event) {
     onMessageCallback(event.data);
 });
 
+// via: https://bugs.chromium.org/p/chromium/issues/detail?id=487935#c17
+// you can capture screen on Android Chrome >= 55 with flag: "Experimental ScreenCapture android"
+window.IsAndroidChrome = false;
+try {
+    if (navigator.userAgent.toLowerCase().indexOf("android") > -1 && /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor)) {
+        window.IsAndroidChrome = true;
+    }
+} catch (e) {}
+
 // and the function that handles received messages
 
 function onMessageCallback(data) {
@@ -56,6 +65,12 @@ function isChromeExtensionAvailable(callback) {
 
     if (isFirefox) return isFirefoxExtensionAvailable(callback);
 
+    if (window.IsAndroidChrome) {
+        chromeMediaSource = 'screen';
+        callback(true);
+        return;
+    }
+
     if (chromeMediaSource == 'desktop') return callback(true);
 
     // ask extension if it is available
@@ -124,6 +139,12 @@ function getSourceId(callback, audioPlusTab) {
 }
 
 function getChromeExtensionStatus(extensionid, callback) {
+    if (window.IsAndroidChrome) {
+        chromeMediaSource = 'screen';
+        callback('installed-enabled');
+        return;
+    }
+
     if (arguments.length != 2) {
         callback = extensionid;
         extensionid = window.RMCExtensionID || 'ajhifddimkapgcifgcodmmfdlknahffk'; // default extension-id
@@ -173,6 +194,12 @@ function getScreenConstraints(callback, audioPlusTab) {
             optional: []
         };
 
+        if (window.IsAndroidChrome) {
+            // now invoking native getUserMedia API
+            callback(null, screen_constraints);
+            return;
+        }
+
         // this statement verifies chrome extension availability
         // if installed and available then it will invoke extension API
         // otherwise it will fallback to command-line based screen capturing API

diff --git a/dev/StreamsHandler.js b/dev/StreamsHandler.js
@@ -129,10 +129,9 @@ var StreamsHandler = (function() {
             mediaElement.volume = 0;
             afterEach(200, 5, function() {
                 try {
-                  mediaElement.volume += .20;
-                }
-                catch(e) {
-                  mediaElement.volume = 1;
+                    mediaElement.volume += .20;
+                } catch (e) {
+                    mediaElement.volume = 1;
                 }
             });
         }

diff --git a/dev/getScreenId.js b/dev/getScreenId.js
@@ -1,4 +1,4 @@
-// Last time updated at Sep 01, 2016, 08:32:23
+// Last time updated at Nov 07, 2016, 08:32:23
 
 // Latest file can be found here: https://cdn.webrtc-experiment.com/getScreenId.js
 
@@ -21,8 +21,35 @@ getScreenId(function (error, sourceId, screen_constraints) {
 });
 */
 
+// via: https://bugs.chromium.org/p/chromium/issues/detail?id=487935#c17
+// you can capture screen on Android Chrome >= 55 with flag: "Experimental ScreenCapture android"
+window.IsAndroidChrome = false;
+try {
+    if (navigator.userAgent.toLowerCase().indexOf("android") > -1 && /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor)) {
+        window.IsAndroidChrome = true;
+    }
+} catch (e) {}
+
 (function() {
     window.getScreenId = function(callback) {
+        if (window.IsAndroidChrome) {
+            var screen_constraints = {
+                mandatory: {
+                    chromeMediaSource: 'screen',
+                    maxWidth: 29999,
+                    maxHeight: 8640,
+                    minFrameRate: 30,
+                    maxFrameRate: 128,
+                    minAspectRatio: 1.77 // 2.39
+                },
+                optional: []
+            };
+            callback(null, null, {
+                video: screen_constraints
+            });
+            return;
+        }
+
         // for Firefox:
         // sourceId == 'firefox'
         // screen_constraints = {...}
@@ -115,6 +142,22 @@ getScreenId(function (error, sourceId, screen_constraints) {
 
     // this function is used in v3.0
     window.getScreenConstraints = function(callback) {
+        if (window.IsAndroidChrome) {
+            var screen_constraints = {
+                mandatory: {
+                    chromeMediaSource: 'screen',
+                    maxWidth: 29999,
+                    maxHeight: 8640,
+                    minFrameRate: 30,
+                    maxFrameRate: 128,
+                    minAspectRatio: 1.77 // 2.39
+                },
+                optional: []
+            };
+            callback(null, screen_constraints);
+            return;
+        }
+
         loadIFrame(function() {
             getScreenId(function(error, sourceId, screen_constraints) {
                 callback(error, (screen_constraints || {}).video);
@@ -221,6 +264,22 @@ getScreenId(function (error, sourceId, screen_constraints) {
 
     // this function is used in v3.0
     window.getScreenConstraints = function(callback) {
+        if (window.IsAndroidChrome) {
+            var screen_constraints = {
+                mandatory: {
+                    chromeMediaSource: 'screen',
+                    maxWidth: 29999,
+                    maxHeight: 8640,
+                    minFrameRate: 30,
+                    maxFrameRate: 128,
+                    minAspectRatio: 1.77 // 2.39
+                },
+                optional: []
+            };
+            callback(null, screen_constraints);
+            return;
+        }
+
         loadIFrame(function() {
             getScreenId(function(error, sourceId, screen_constraints) {
                 callback(error, (screen_constraints || {}).video);

diff --git a/dev/getUserMedia.js b/dev/getUserMedia.js
@@ -45,7 +45,7 @@ function getUserMediaHandler(options) {
     }
     currentUserMediaRequest.mutex = true;
 
-    // easy way to match 
+    // easy way to match
     var idInstance = JSON.stringify(options.localMediaConstraints);
 
     function streaming(stream, returnBack) {

diff --git a/dist/RTCMultiConnection.js b/dist/RTCMultiConnection.js
@@ -1,7 +1,7 @@
-// Last time updated: 2016-11-04 9:09:57 AM UTC
+// Last time updated: 2016-11-07 3:00:06 PM UTC
 
 // _________________________
-// RTCMultiConnection v3.4.1
+// RTCMultiConnection v3.4.2
 
 // Open-Sourced: https://github.com/muaz-khan/RTCMultiConnection
 
@@ -1582,7 +1582,7 @@
         };
 
         connection.trickleIce = true;
-        connection.version = '3.4.1';
+        connection.version = '3.4.2';
     }
 
     function SocketConnection(connection, connectCallback) {
@@ -2077,7 +2077,9 @@
                     self.onDataChannelClosed(event, remoteUserId);
                 },
                 onRemoteStream: function(stream) {
-                    connection.peers[remoteUserId].streams.push(stream);
+                    if (connection.peers[remoteUserId]) {
+                        connection.peers[remoteUserId].streams.push(stream);
+                    }
 
                     if (isPluginRTC && window.PluginRTC) {
                         var mediaElement = document.createElement('video');
@@ -4022,6 +4024,7 @@
 
         var streamObject;
         peer.addEventListener(remoteStreamAddEvent, function(event) {
+            if (!event) return;
             if (event.streams && event.streams.length && !event.stream) {
                 if (!streamObject) {
                     streamObject = new MediaStream();
@@ -4753,7 +4756,7 @@
         }
         currentUserMediaRequest.mutex = true;
 
-        // easy way to match 
+        // easy way to match
         var idInstance = JSON.stringify(options.localMediaConstraints);
 
         function streaming(stream, returnBack) {
@@ -4954,7 +4957,11 @@
                 var mediaElement = connection.streamEvents[stream.streamid].mediaElement;
                 mediaElement.volume = 0;
                 afterEach(200, 5, function() {
-                    mediaElement.volume += .20;
+                    try {
+                        mediaElement.volume += .20;
+                    } catch (e) {
+                        mediaElement.volume = 1;
+                    }
                 });
             }
         }
@@ -4975,7 +4982,7 @@
         };
     })();
 
-    // Last time updated at Sep 01, 2016, 08:32:23
+    // Last time updated at Nov 07, 2016, 08:32:23
 
     // Latest file can be found here: https://cdn.webrtc-experiment.com/Screen-Capturing.js
 
@@ -4998,6 +5005,15 @@
         onMessageCallback(event.data);
     });
 
+    // via: https://bugs.chromium.org/p/chromium/issues/detail?id=487935#c17
+    // you can capture screen on Android Chrome >= 55 with flag: "Experimental ScreenCapture android"
+    window.IsAndroidChrome = false;
+    try {
+        if (navigator.userAgent.toLowerCase().indexOf("android") > -1 && /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor)) {
+            window.IsAndroidChrome = true;
+        }
+    } catch (e) {}
+
     // and the function that handles received messages
 
     function onMessageCallback(data) {
@@ -5033,6 +5049,12 @@
 
         if (isFirefox) return isFirefoxExtensionAvailable(callback);
 
+        if (window.IsAndroidChrome) {
+            chromeMediaSource = 'screen';
+            callback(true);
+            return;
+        }
+
         if (chromeMediaSource == 'desktop') return callback(true);
 
         // ask extension if it is available
@@ -5101,6 +5123,12 @@
     }
 
     function getChromeExtensionStatus(extensionid, callback) {
+        if (window.IsAndroidChrome) {
+            chromeMediaSource = 'screen';
+            callback('installed-enabled');
+            return;
+        }
+
         if (arguments.length != 2) {
             callback = extensionid;
             extensionid = window.RMCExtensionID || 'ajhifddimkapgcifgcodmmfdlknahffk'; // default extension-id
@@ -5150,6 +5178,12 @@
                 optional: []
             };
 
+            if (window.IsAndroidChrome) {
+                // now invoking native getUserMedia API
+                callback(null, screen_constraints);
+                return;
+            }
+
             // this statement verifies chrome extension availability
             // if installed and available then it will invoke extension API
             // otherwise it will fallback to command-line based screen capturing API

diff --git a/dist/RTCMultiConnection.min.js b/dist/RTCMultiConnection.min.js