MultiStreamsMixer, DetectRTC, RecordRTC, RTCMultiConnection updated.

dathacky · Jul 8, 2019 · 2aefed4 · 2aefed4
1 parent fcbda5f
commit 2aefed4
Show file tree

Hide file tree

Showing 193 changed files with 3,843 additions and 20,610 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,7 @@
 RecordRTC/RecordRTC-to-Nodejs/uploads/
 *.DS_Store
+ffmpeg/ffmpeg_asm.js
+node_modules
+RecordRTC/node_modules
+DetectRTC/node_modules
+RTCMultiConnection/node_modules
diff --git a/DetectRTC/.travis.yml b/DetectRTC/.travis.yml
@@ -1,6 +1,12 @@
 language: node_js
 node_js:
-  - "0.11"
+  - "8"
+  - "10"
+git:
+  depth: 5
+cache:
+  directories:
+    node_modules
 install: npm install
 before_script:
   - npm install [email protected] -g

diff --git a/DetectRTC/README.md b/DetectRTC/README.md
@@ -319,12 +319,6 @@ grunt
 
 **Check tests here:** https://travis-ci.org/muaz-khan/DetectRTC
 
-# Disclaimer
-
-There is no warranty, expressed or implied, associated with this product. Use at your own risk.
-
-* https://www.webrtc-experiment.com/disclaimer/
-
 # License
 
 [DetectRTC.js](https://github.com/muaz-khan/DetectRTC) is released under [MIT licence](https://www.webrtc-experiment.com/licence/) . Copyright (c) [Muaz Khan](http://www.MuazKhan.com/).
diff --git a/DetectRTC/test/html-test-files/CheckDeviceSupport.html b/DetectRTC/test/html-test-files/CheckDeviceSupport.html
@@ -2,7 +2,7 @@
 audioOutputDevices: <span id="audioOutputDevices"></span><hr>
 videoInputDevices: <span id="videoInputDevices"></span>
 
-<script src="https://cdn.webrtc-experiment.com/DetectRTC/dev/CheckDeviceSupport.js"> </script>
+<script src="https://www.webrtc-experiment.com/DetectRTC/dev/CheckDeviceSupport.js"> </script>
 <script type="text/javascript">
     checkDeviceSupport(function() {
         document.getElementById('audioInputDevices').innerHTML = audioInputDevices.length;

diff --git a/DetectRTC/test/html-test-files/DetectRTC.html b/DetectRTC/test/html-test-files/DetectRTC.html
@@ -1,4 +1,4 @@
-<script src="https://cdn.webrtc-experiment.com/DetectRTC.js"> </script>
+<script src="https://www.webrtc-experiment.com/DetectRTC.js"> </script>
 <script type="text/javascript">
 ['hasWebcam', 'hasMicrophone', 'hasSpeakers', 'isApplyConstraintsSupported',
     'isAudioContextSupported', 'isCanvasSupportsStreamCapturing',

diff --git a/DetectRTC/test/html-test-files/detectOSName.html b/DetectRTC/test/html-test-files/detectOSName.html
@@ -1,8 +1,8 @@
 osName: <span id="osName"></span><hr>
 osVersion: <span id="osVersion"></span>
 
-<script src="https://cdn.webrtc-experiment.com/DetectRTC/dev/detectDesktopOS.js"> </script>
-<script src="https://cdn.webrtc-experiment.com/DetectRTC/dev/detectOSName.js"> </script>
+<script src="https://www.webrtc-experiment.com/DetectRTC/dev/detectDesktopOS.js"> </script>
+<script src="https://www.webrtc-experiment.com/DetectRTC/dev/detectOSName.js"> </script>
 <script type="text/javascript">
     document.getElementById('osName').innerHTML = osName;
     document.getElementById('osVersion').innerHTML = osVersion;

diff --git a/DetectRTC/test/html-test-files/getBrowserInfo.html b/DetectRTC/test/html-test-files/getBrowserInfo.html
@@ -3,8 +3,8 @@
 browserFullVersion: <span id="browserFullVersion"></span><hr>
 isPrivateBrowsing: <span id="isPrivateBrowsing"></span>
 
-<script src="https://cdn.webrtc-experiment.com/DetectRTC/dev/getBrowserInfo.js"> </script>
-<script src="https://cdn.webrtc-experiment.com/DetectRTC/dev/detectPrivateBrowsing.js"> </script>
+<script src="https://www.webrtc-experiment.com/DetectRTC/dev/getBrowserInfo.js"> </script>
+<script src="https://www.webrtc-experiment.com/DetectRTC/dev/detectPrivateBrowsing.js"> </script>
 <script type="text/javascript">
     var browser = getBrowserInfo();
 

diff --git a/MultiStreamsMixer/.gitignore b/MultiStreamsMixer/.gitignore
@@ -5,4 +5,5 @@ node_modules
 bower_components
 
 npm-debug.log
-.DS_Store
+.DS_Store
+package-lock.json
diff --git a/MultiStreamsMixer/.travis.yml b/MultiStreamsMixer/.travis.yml
@@ -1,6 +1,12 @@
 language: node_js
 node_js:
-  - "0.11"
+  - "8"
+  - "10"
+git:
+  depth: 5
+cache:
+  directories:
+    node_modules
 install: npm install
 before_script:
   - npm install [email protected] -g

diff --git a/MultiStreamsMixer/Gruntfile.js b/MultiStreamsMixer/Gruntfile.js
@@ -34,6 +34,7 @@ module.exports = function(grunt) {
             dist: {
                 src: [
                     'dev/head.js',
+                    'dev/amd.js',
                     'dev/init.js',
                     'dev/cross-browser-declarations.js',
                     'dev/start-drawing-frames.js',

diff --git a/MultiStreamsMixer/MultiStreamsMixer.js b/MultiStreamsMixer/MultiStreamsMixer.js
@@ -1,7 +1,7 @@
-// Last time updated: 2019-01-12 7:02:57 AM UTC
+// Last time updated: 2019-06-24 6:39:09 PM UTC
 
 // ________________________
-// MultiStreamsMixer v1.0.7
+// MultiStreamsMixer v1.2.3
 
 // Open-Sourced: https://github.com/muaz-khan/MultiStreamsMixer
 
@@ -10,16 +10,119 @@
 // MIT License   - www.WebRTC-Experiment.com/licence
 // --------------------------------------------------
 
-function MultiStreamsMixer(arrayOfMediaStreams) {
+function MultiStreamsMixer(arrayOfMediaStreams, elementClass) {
+
+    var browserFakeUserAgent = 'Fake/5.0 (FakeOS) AppleWebKit/123 (KHTML, like Gecko) Fake/12.3.4567.89 Fake/123.45';
+
+    (function(that) {
+        if (typeof RecordRTC !== 'undefined') {
+            return;
+        }
+
+        if (!that) {
+            return;
+        }
+
+        if (typeof window !== 'undefined') {
+            return;
+        }
+
+        if (typeof global === 'undefined') {
+            return;
+        }
+
+        global.navigator = {
+            userAgent: browserFakeUserAgent,
+            getUserMedia: function() {}
+        };
+
+        if (!global.console) {
+            global.console = {};
+        }
+
+        if (typeof global.console.log === 'undefined' || typeof global.console.error === 'undefined') {
+            global.console.error = global.console.log = global.console.log || function() {
+                console.log(arguments);
+            };
+        }
+
+        if (typeof document === 'undefined') {
+            /*global document:true */
+            that.document = {
+                documentElement: {
+                    appendChild: function() {
+                        return '';
+                    }
+                }
+            };
+
+            document.createElement = document.captureStream = document.mozCaptureStream = function() {
+                var obj = {
+                    getContext: function() {
+                        return obj;
+                    },
+                    play: function() {},
+                    pause: function() {},
+                    drawImage: function() {},
+                    toDataURL: function() {
+                        return '';
+                    },
+                    style: {}
+                };
+                return obj;
+            };
+
+            that.HTMLVideoElement = function() {};
+        }
+
+        if (typeof location === 'undefined') {
+            /*global location:true */
+            that.location = {
+                protocol: 'file:',
+                href: '',
+                hash: ''
+            };
+        }
+
+        if (typeof screen === 'undefined') {
+            /*global screen:true */
+            that.screen = {
+                width: 0,
+                height: 0
+            };
+        }
+
+        if (typeof URL === 'undefined') {
+            /*global screen:true */
+            that.URL = {
+                createObjectURL: function() {
+                    return '';
+                },
+                revokeObjectURL: function() {
+                    return '';
+                }
+            };
+        }
+
+        /*global window:true */
+        that.window = global;
+    })(typeof global !== 'undefined' ? global : null);
 
     // requires: chrome://flags/#enable-experimental-web-platform-features
 
+    elementClass = elementClass || 'multi-streams-mixer';
+
     var videos = [];
     var isStopDrawingFrames = false;
 
     var canvas = document.createElement('canvas');
     var context = canvas.getContext('2d');
-    canvas.style = 'opacity:0;position:absolute;z-index:-1;top: -100000000;left:-1000000000; margin-top:-1000000000;margin-left:-1000000000;';
+    canvas.style.opacity = 0;
+    canvas.style.position = 'absolute';
+    canvas.style.zIndex = -1;
+    canvas.style.top = '-1000em';
+    canvas.style.left = '-1000em';
+    canvas.className = elementClass;
     (document.body || document.documentElement).appendChild(canvas);
 
     this.disableLogs = false;
@@ -126,6 +229,7 @@ function MultiStreamsMixer(arrayOfMediaStreams) {
             if (video.stream.fullcanvas) {
                 fullcanvas = video;
             } else {
+                // todo: video.stream.active or video.stream.live to fix blank frames issues?
                 remaining.push(video);
             }
         });
@@ -250,6 +354,10 @@ function MultiStreamsMixer(arrayOfMediaStreams) {
             }
         });
 
+        // mixedVideoStream.prototype.appendStreams = appendStreams;
+        // mixedVideoStream.prototype.resetVideoStreams = resetVideoStreams;
+        // mixedVideoStream.prototype.clearRecordedData = clearRecordedData;
+
         return mixedVideoStream;
     }
 
@@ -314,10 +422,6 @@ function MultiStreamsMixer(arrayOfMediaStreams) {
             self.audioSources.push(audioSource);
         });
 
-        if (!audioTracksLength) {
-            return;
-        }
-
         self.audioDestination = self.audioContext.createMediaStreamDestination();
         self.audioSources.forEach(function(audioSource) {
             audioSource.connect(self.audioDestination);
@@ -330,6 +434,8 @@ function MultiStreamsMixer(arrayOfMediaStreams) {
 
         setSrcObject(stream, video);
 
+        video.className = elementClass;
+
         video.muted = true;
         video.volume = 0;
 
@@ -350,23 +456,33 @@ function MultiStreamsMixer(arrayOfMediaStreams) {
             streams = [streams];
         }
 
-        arrayOfMediaStreams.concat(streams);
-
         streams.forEach(function(stream) {
+            arrayOfMediaStreams.push(stream);
+
+            var newStream = new MediaStream();
+
             if (stream.getTracks().filter(function(t) {
                     return t.kind === 'video';
                 }).length) {
                 var video = getVideo(stream);
                 video.stream = stream;
                 videos.push(video);
+
+                newStream.addTrack(stream.getTracks().filter(function(t) {
+                    return t.kind === 'video';
+                })[0]);
             }
 
             if (stream.getTracks().filter(function(t) {
                     return t.kind === 'audio';
-                }).length && self.audioContext) {
+                }).length) {
                 var audioSource = self.audioContext.createMediaStreamSource(stream);
+                // self.audioDestination = self.audioContext.createMediaStreamDestination();
                 audioSource.connect(self.audioDestination);
-                self.audioSources.push(audioSource);
+
+                newStream.addTrack(self.audioDestination.stream.getTracks().filter(function(t) {
+                    return t.kind === 'audio';
+                })[0]);
             }
         });
     };
@@ -441,3 +557,15 @@ function MultiStreamsMixer(arrayOfMediaStreams) {
     this.getMixedStream = getMixedStream;
 
 }
+
+if (typeof RecordRTC === 'undefined') {
+    if (typeof module !== 'undefined' /* && !!module.exports*/ ) {
+        module.exports = MultiStreamsMixer;
+    }
+
+    if (typeof define === 'function' && define.amd) {
+        define('MultiStreamsMixer', [], function() {
+            return MultiStreamsMixer;
+        });
+    }
+}
diff --git a/MultiStreamsMixer/MultiStreamsMixer.min.js b/MultiStreamsMixer/MultiStreamsMixer.min.js
diff --git a/MultiStreamsMixer/MultiStreamsMixer.ts b/MultiStreamsMixer/MultiStreamsMixer.ts
@@ -12,22 +12,25 @@ export class MultiStreamsMixer {
   height: number;
   useGainNode : boolean;
   arrayOfMediaStreams: Array<MediaStream>;
+  elementClass: string;
   /********************************************/
   audioContext : any;
   audioDestination : any;
   audioSources : Array<any>;
   gainNode : GainNode;
 
 
-  constructor (_arrayOfMediaStreams) {
+  constructor (_arrayOfMediaStreams, elementClass = 'multi-streams-mixer') {
     // requires: chrome://flags/#enable-experimental-web-platform-features
     this.arrayOfMediaStreams = _arrayOfMediaStreams;
+    this.elementClass = elementClass;
     this.videos = new Array<any>();
     this.isStopDrawingFrames = false;
     this.canvas = document.createElement('canvas');
     this.context = this.canvas.getContext('2d');
-    // this.canvas.style = 'opacity:0;position:absolute;z-index:-1;top: -100000000;left:-1000000000; margin-top:-1000000000;margin-left:-1000000000;';
-    // (document.body || document.documentElement).appendChild(canvas);
+    this.canvas.style = 'opacity:0;position:absolute;z-index:-1;top: -100000000;left:-1000000000; margin-top:-1000000000;margin-left:-1000000000;';
+    this.canvas.className = this.elementClass;
+    (document.body || document.documentElement).appendChild(canvas);
     this.disableLogs = false;
     this.frameInterval = 10;
     this.width = 360;
@@ -259,6 +262,7 @@ export class MultiStreamsMixer {
   private getVideo(stream) {
     var video = document.createElement('video');
     this.setSrcObject(stream, video);
+    video.className = this.elementClass;
     video.muted = true;
     video.volume = 0;
     video.width = stream.width || this.width || 360;