Released: MultiStreamsMixer v1.0.4

muaz-khan · Sep 27, 2017 · fa2f621 · fa2f621
1 parent bb316ce
commit fa2f621
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 42 deletions.
diff --git a/MultiStreamsMixer.js b/MultiStreamsMixer.js
@@ -1,7 +1,7 @@
-// Last time updated: 2017-09-04 2:21:39 PM UTC
+// Last time updated: 2017-09-27 9:40:20 AM UTC
 
 // ________________________
-// MultiStreamsMixer v1.0.3
+// MultiStreamsMixer v1.0.4
 
 // Open-Sourced: https://github.com/muaz-khan/MultiStreamsMixer
 
@@ -125,6 +125,23 @@ function MultiStreamsMixer(arrayOfMediaStreams) {
         Storage.AudioContext = webkitAudioContext;
     }
 
+    function setSrcObject(stream, element, ignoreCreateObjectURL) {
+        if ('createObjectURL' in URL && !ignoreCreateObjectURL) {
+            try {
+                element.src = URL.createObjectURL(stream);
+            } catch (e) {
+                setSrcObject(stream, element, true);
+                return;
+            }
+        } else if ('srcObject' in element) {
+            element.srcObject = stream;
+        } else if ('mozSrcObject' in element) {
+            element.mozSrcObject = stream;
+        } else {
+            alert('createObjectURL/srcObject both are not supported.');
+        }
+    }
+
     this.startDrawingFrames = function() {
         drawVideosToCanvas();
     };
@@ -157,16 +174,16 @@ function MultiStreamsMixer(arrayOfMediaStreams) {
             canvas.width = videosLength > 1 ? remaining[0].width * 2 : remaining[0].width;
 
             var height = 1;
-            if (videosLength == 3 || videosLength == 4) {
+            if (videosLength === 3 || videosLength === 4) {
                 height = 2;
             }
-            if (videosLength == 5 || videosLength == 6) {
+            if (videosLength === 5 || videosLength === 6) {
                 height = 3;
             }
-            if (videosLength == 7 || videosLength == 8) {
+            if (videosLength === 7 || videosLength === 8) {
                 height = 4;
             }
-            if (videosLength == 9 || videosLength == 10) {
+            if (videosLength === 9 || videosLength === 10) {
                 height = 5;
             }
             canvas.height = remaining[0].height * height;
@@ -342,11 +359,7 @@ function MultiStreamsMixer(arrayOfMediaStreams) {
     function getVideo(stream) {
         var video = document.createElement('video');
 
-        if ('srcObject' in video) {
-            video.srcObject = stream;
-        } else {
-            video.src = URL.createObjectURL(stream);
-        }
+        setSrcObject(stream, video);
 
         video.muted = true;
         video.volume = 0;

diff --git a/MultiStreamsMixer.min.js b/MultiStreamsMixer.min.js
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Or link specific build:
 * https://github.com/muaz-khan/MultiStreamsMixer/releases
 
 ```html
-<script src="https://github.com/muaz-khan/MultiStreamsMixer/releases/download/1.0.3/MultiStreamsMixer.js"></script>
+<script src="https://github.com/muaz-khan/MultiStreamsMixer/releases/download/1.0.4/MultiStreamsMixer.js"></script>
 ```
 
 # How to mix audios?

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "multistreamsmixer",
     "description": "Pass multiple streams (e.g. screen+camera or multiple-cameras) and get single stream.",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "authors": [
         {
             "name": "Muaz Khan",

diff --git a/dev/cross-browser-declarations.js b/dev/cross-browser-declarations.js
@@ -89,3 +89,20 @@ if (typeof AudioContext !== 'undefined') {
 } else if (typeof webkitAudioContext !== 'undefined') {
     Storage.AudioContext = webkitAudioContext;
 }
+
+function setSrcObject(stream, element, ignoreCreateObjectURL) {
+    if ('createObjectURL' in URL && !ignoreCreateObjectURL) {
+        try {
+            element.src = URL.createObjectURL(stream);
+        } catch (e) {
+            setSrcObject(stream, element, true);
+            return;
+        }
+    } else if ('srcObject' in element) {
+        element.srcObject = stream;
+    } else if ('mozSrcObject' in element) {
+        element.mozSrcObject = stream;
+    } else {
+        alert('createObjectURL/srcObject both are not supported.');
+    }
+}
diff --git a/dev/draw-videos-on-canvas.js b/dev/draw-videos-on-canvas.js
@@ -26,16 +26,16 @@ function drawVideosToCanvas() {
         canvas.width = videosLength > 1 ? remaining[0].width * 2 : remaining[0].width;
 
         var height = 1;
-        if (videosLength == 3 || videosLength == 4) {
+        if (videosLength === 3 || videosLength === 4) {
             height = 2;
         }
-        if (videosLength == 5 || videosLength == 6) {
+        if (videosLength === 5 || videosLength === 6) {
             height = 3;
         }
-        if (videosLength == 7 || videosLength == 8) {
+        if (videosLength === 7 || videosLength === 8) {
             height = 4;
         }
-        if (videosLength == 9 || videosLength == 10) {
+        if (videosLength === 9 || videosLength === 10) {
             height = 5;
         }
         canvas.height = remaining[0].height * height;

diff --git a/dev/get-video-element.js b/dev/get-video-element.js
@@ -1,11 +1,7 @@
 function getVideo(stream) {
     var video = document.createElement('video');
 
-    if ('srcObject' in video) {
-        video.srcObject = stream;
-    } else {
-        video.src = URL.createObjectURL(stream);
-    }
+    setSrcObject(stream, video);
 
     video.muted = true;
     video.volume = 0;