diff options
| author | Gubolin <gubolin@fantasymail.de> | 2014-08-17 18:15:31 +0200 |
|---|---|---|
| committer | Gubolin <gubolin@fantasymail.de> | 2014-08-17 18:15:31 +0200 |
| commit | 672dba7c414e027c899bb51892367cfc7e5976e4 (patch) | |
| tree | 374a9647bac0ac570c23143a845d210b605e5741 | |
| parent | 849e666a236c5037265b1c620bc536ec889dafae (diff) | |
| download | snap-672dba7c414e027c899bb51892367cfc7e5976e4.tar.gz snap-672dba7c414e027c899bb51892367cfc7e5976e4.zip | |
add IE camera block support
| -rw-r--r-- | threads.js | 22 |
1 files changed, 9 insertions, 13 deletions
@@ -2780,21 +2780,17 @@ Process.prototype.doStreamCamera = function () { var videoObject = {'video': true, 'audio': false}; - if (navigator.getUserMedia) { - navigator.getUserMedia(videoObject, function (stream) { - video.src = stream; + navigator.getUserMedia_ = (navigator.getUserMedia || + navigator.webkitGetUserMedia || + navigator.mozGetUserMedia || + navigator.msGetUserMedia); + + if (!! navigator.getUserMedia_) { + navigator.getUserMedia_(videoObject, function (stream) { + window.URL_ = window.URL || window.webkitURL; + video.src = window.URL_.createObjectURL(stream); video.play(); }, this.handleError); // TODO: improve error handling - } else if (navigator.webkitGetUserMedia) { - navigator.webkitGetUserMedia(videoObject, function (stream) { - video.src = window.webkitURL.createObjectURL(stream); - video.play(); - }, this.handleError); - } else if (navigator.mozGetUserMedia) { - navigator.mozGetUserMedia(videoObject, function (stream) { - video.src = window.URL.createObjectURL(stream); - video.play(); - }, this.handleError); } stage.lastCameraCanvas = newCanvas(stage.dimensions); } else { |
