CB-10502 Fix camera plugin exception in Chrome when click capture.

The MediaStream.stop() method has been deprecated as of Chrome 47. We were using it, and it was generating an exception.

If stop() method is not found, instead stop each individual track (the new way of doing it).
This commit is contained in:
Tim Barham
2016-02-02 16:25:00 +10:00
parent 06fcbf05a2
commit e48a7e5c5c
+13 -6
View File
@@ -37,7 +37,7 @@ function takePicture(success, error, opts) {
var imageData = readerEvent.target.result; var imageData = readerEvent.target.result;
return success(imageData.substr(imageData.indexOf(',') + 1)); return success(imageData.substr(imageData.indexOf(',') + 1));
} };
reader.readAsDataURL(inputEvent.target.files[0]); reader.readAsDataURL(inputEvent.target.files[0]);
}; };
@@ -60,18 +60,25 @@ function capture(success, errorCallback) {
// create a canvas and capture a frame from video stream // create a canvas and capture a frame from video stream
var canvas = document.createElement('canvas'); var canvas = document.createElement('canvas');
canvas.getContext('2d').drawImage(video, 0, 0, 320, 240); canvas.getContext('2d').drawImage(video, 0, 0, 320, 240);
// convert image stored in canvas to base64 encoded image // convert image stored in canvas to base64 encoded image
var imageData = canvas.toDataURL('img/png'); var imageData = canvas.toDataURL('img/png');
imageData = imageData.replace('data:image/png;base64,', ''); imageData = imageData.replace('data:image/png;base64,', '');
// stop video stream, remove video and button // stop video stream, remove video and button.
localMediaStream.stop(); // Note that MediaStream.stop() is deprecated as of Chrome 47.
if (localMediaStream.stop) {
localMediaStream.stop();
} else {
localMediaStream.getTracks().forEach(function (track) {
track.stop();
});
}
video.parentNode.removeChild(video); video.parentNode.removeChild(video);
button.parentNode.removeChild(button); button.parentNode.removeChild(button);
return success(imageData); return success(imageData);
} };
navigator.getUserMedia = navigator.getUserMedia || navigator.getUserMedia = navigator.getUserMedia ||
navigator.webkitGetUserMedia || navigator.webkitGetUserMedia ||
@@ -85,7 +92,7 @@ function capture(success, errorCallback) {
document.body.appendChild(video); document.body.appendChild(video);
document.body.appendChild(button); document.body.appendChild(button);
} };
if (navigator.getUserMedia) { if (navigator.getUserMedia) {
navigator.getUserMedia({video: true, audio: true}, successCallback, errorCallback); navigator.getUserMedia({video: true, audio: true}, successCallback, errorCallback);