Release camera when stop is called

serratus · Dec 17, 2014 · 655bc64 · 655bc64
1 parent 460e406
commit 655bc64
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/camera_access.js b/src/camera_access.js
@@ -3,7 +3,8 @@
 
 define(function() {
     "use strict";
-
+    var streamRef;
+
     /**
      * Wraps browser-specific getUserMedia
      * @param {Object} constraints
@@ -12,6 +13,7 @@ define(function() {
      */
     function getUserMedia(constraints, success, failure) {
         navigator.getUserMedia(constraints, function(stream) {
+            streamRef = stream;
             var videoSrc = (window.URL && window.URL.createObjectURL(stream)) || stream;
             success.apply(null, [videoSrc]);
         }, failure);
@@ -89,6 +91,12 @@ define(function() {
     return {
         request : function(video, callback) {
             request(video, callback);
+        },
+        release : function() {
+          var tracks = streamRef && streamRef.getVideoTracks();
+          if (tracks.length)
+            tracks[0].stop();
+          streamRef = null;
         }
     };
 }); 
diff --git a/src/quagga.js b/src/quagga.js
@@ -191,6 +191,9 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
         },
         stop : function() {
             _stopped = true;
+            if (_config.inputStream.type == "LiveStream") {
+              CameraAccess.release();
+            }
         },
         onDetected : function(callback) {
             Events.subscribe("detected", callback);