Skip to content

Commit

Permalink
Fixed createObjectURL issue
Browse files Browse the repository at this point in the history
  • Loading branch information
muaz-khan committed Dec 22, 2018
1 parent ab48d60 commit fb27651
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 15 deletions.
8 changes: 3 additions & 5 deletions MultiStreamsMixer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Last time updated: 2018-10-26 9:05:36 AM UTC
// Last time updated: 2018-12-22 9:13:29 AM UTC

// ________________________
// MultiStreamsMixer v1.0.5
// MultiStreamsMixer v1.0.7

// Open-Sourced: https://github.com/muaz-khan/MultiStreamsMixer

Expand Down Expand Up @@ -100,10 +100,8 @@ function MultiStreamsMixer(arrayOfMediaStreams) {
element.srcObject = stream;
} else if ('mozSrcObject' in element) {
element.mozSrcObject = stream;
} else if ('createObjectURL' in URL) {
element.src = URL.createObjectURL(stream);
} else {
alert('createObjectURL/srcObject both are not supported.');
element.srcObject = stream;
}
}

Expand Down
6 changes: 3 additions & 3 deletions MultiStreamsMixer.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "multistreamsmixer",
"description": "Pass multiple streams (e.g. screen+camera or multiple-cameras) and get single stream.",
"version": "1.0.6",
"version": "1.0.7",
"authors": [
{
"name": "Muaz Khan",
"email": "muazkh@gmail.com",
"homepage": "http://www.muazkhan.com/"
"homepage": "https://muazkhan.com/"
}
],
"main": "./MultiStreamsMixer.js",
Expand Down
4 changes: 1 addition & 3 deletions dev/cross-browser-declarations.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ function setSrcObject(stream, element) {
element.srcObject = stream;
} else if ('mozSrcObject' in element) {
element.mozSrcObject = stream;
} else if ('createObjectURL' in URL) {
element.src = URL.createObjectURL(stream);
} else {
alert('createObjectURL/srcObject both are not supported.');
element.srcObject = stream;
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "multistreamsmixer",
"preferGlobal": true,
"version": "1.0.6",
"version": "1.0.7",
"author": {
"name": "Muaz Khan",
"email": "muazkh@gmail.com",
"url": "http://www.muazkhan.com/"
"url": "https://muazkhan.com/"
},
"description": "Pass multiple streams (e.g. screen+camera or multiple-cameras) and get single stream.",
"scripts": {
Expand Down

0 comments on commit fb27651

Please sign in to comment.