From 672dba7c414e027c899bb51892367cfc7e5976e4 Mon Sep 17 00:00:00 2001 From: Gubolin Date: Sun, 17 Aug 2014 18:15:31 +0200 Subject: add IE camera block support --- threads.js | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'threads.js') diff --git a/threads.js b/threads.js index 39537c0..44b01f1 100644 --- a/threads.js +++ b/threads.js @@ -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 { -- cgit v1.3.1