Cleaning up after stopping quagga

dist/quagga.js

@@ -437,7 +437,7 @@ define("almond", function(){});
 
 define(
     'barcode_reader',[],function() {
-        
+        "use strict";
         
         function BarcodeReader() {
             this._row = [];
@@ -631,7 +631,7 @@ define(
         "./barcode_reader"
     ],
     function(BarcodeReader) {
-        
+        "use strict";
         
         function Code128Reader() {
             BarcodeReader.call(this);
@@ -1079,7 +1079,7 @@ define(
         "./barcode_reader"
     ],
     function(BarcodeReader) {
-        
+        "use strict";
         
         function EANReader() {
             BarcodeReader.call(this);
@@ -1269,6 +1269,7 @@ define(
                     return endInfo;
                 }
             }
+            return null;
         };
 
         EANReader.prototype._findEnd = function(offset, isWhite) {
@@ -1334,7 +1335,7 @@ define(
                 decodedCodes.push(code);
                 code = self._decodePayload(code, result, decodedCodes);
                 code = self._findEnd(code.end, false);
-                if (code === null){
+                if (!code){
                     return null;
                 }
 
@@ -1378,7 +1379,7 @@ define(
 /* global define */
 
 define('image_loader',[],function() {
-    
+    "use strict";
 
     var ImageLoader = {};
     ImageLoader.load = function(directory, callback, offset, size, sequence) {
@@ -1442,7 +1443,7 @@ define('image_loader',[],function() {
 /* global define */
 
 define('input_stream',["image_loader"], function(ImageLoader) {
-    
+    "use strict";
 
     var InputStream = {};
     InputStream.createVideoStream = function(video) {
@@ -1508,6 +1509,17 @@ define('input_stream',["image_loader"], function(ImageLoader) {
             }
         };
 
+        that.clearEventHandlers = function() {
+            _eventNames.forEach(function(eventName) {
+                var handlers = _eventHandlers[eventName];
+                if (handlers && handlers.length > 0) {
+                    handlers.forEach(function(handler) {
+                        video.removeEventListener(eventName, handler);
+                    });
+                }
+            });
+        };
+
         that.trigger = function(eventName, args) {
             var j,
                 handlers = _eventHandlers[eventName];
@@ -1708,7 +1720,7 @@ define("typedefs", (function (global) {
 /* global define */
 
 define('subImage',["typedefs"], function() {
-    
+    "use strict";
 
     /**
      * Construct representing a part of another {ImageWrapper}. Shares data
@@ -1805,7 +1817,7 @@ define('subImage',["typedefs"], function() {
 /* global define, vec2 */
 
 define('cluster',[],function() {
-    
+    "use strict";
     
     /**
      * Creates a cluster for grouping similar orientations of datapoints 
@@ -4150,7 +4162,7 @@ define("glMatrixAddon", ["glMatrix"], (function (global) {
 /* global define */
 
 define('array_helper',[],function() {
-    
+    "use strict";
 
     return {
         init : function(arr, val) {
@@ -4237,7 +4249,7 @@ define('array_helper',[],function() {
 
 define('cv_utils',['cluster', 'glMatrixAddon', "array_helper"], function(Cluster2, glMatrixAddon, ArrayHelper) {
 
-    
+    "use strict";
     /*
     * cv_utils.js
     * Collection of CV functions and libraries
@@ -4852,7 +4864,7 @@ define('image_wrapper',[
     ], 
     function(SubImage, CVUtils, ArrayHelper) {
     
-    
+    'use strict';
 
     /**
      * Represents a basic image combining the data and size.
@@ -5273,7 +5285,7 @@ define('image_wrapper',[
  * http://www.codeproject.com/Tips/407172/Connected-Component-Labeling-and-Vectorization
  */
 define('tracer',[],function() {
-    
+    "use strict";
     
     var Tracer = {
         searchDirections : [[0, 1], [1, 1], [1, 0], [1, -1], [0, -1], [-1, -1], [-1, 0], [-1, 1]],
@@ -5382,7 +5394,7 @@ define('tracer',[],function() {
  * http://www.codeproject.com/Tips/407172/Connected-Component-Labeling-and-Vectorization
  */
 define('rasterizer',["tracer"], function(Tracer) {
-    
+    "use strict";
 
     var Rasterizer = {
         createContour2D : function() {
@@ -5578,7 +5590,7 @@ define('rasterizer',["tracer"], function(Tracer) {
 /* global define */
 
 define('skeletonizer',[],function() {
-    
+    "use strict";
 
     /* @preserve ASM BEGIN */
     function Skeletonizer(stdlib, foreign, buffer) {
@@ -5783,7 +5795,7 @@ define('skeletonizer',[],function() {
 /* global define */
 
 define('image_debug',[],function() {
-    
+    "use strict";
     
     return {
         drawRect: function(pos, size, ctx, style){
@@ -6328,7 +6340,7 @@ function(ImageWrapper, CVUtils, Rasterizer, Tracer, skeletonizer, ArrayHelper, I
 /* global define */
 
 define('bresenham',[],function() {
-    
+    "use strict";
     var Bresenham = {};
 
     var Slope = {
@@ -6534,7 +6546,7 @@ define(
         "./array_helper"
     ],
     function(BarcodeReader, ArrayHelper) {
-        
+        "use strict";
 
         function Code39Reader() {
             BarcodeReader.call(this);
@@ -6736,7 +6748,7 @@ define(
         "./barcode_reader"
     ],
     function(BarcodeReader) {
-        
+        "use strict";
 
         function CodabarReader() {
             BarcodeReader.call(this);
@@ -7049,7 +7061,7 @@ define(
         "./ean_reader"
     ],
     function(EANReader) {
-        
+        "use strict";
 
         function UPCReader() {
             EANReader.call(this);
@@ -7080,7 +7092,7 @@ define(
         "./ean_reader"
     ],
     function(EANReader) {
-        
+        "use strict";
 
         function EAN8Reader() {
             EANReader.call(this);
@@ -7125,7 +7137,7 @@ define(
         "./ean_reader"
     ],
     function(EANReader) {
-        
+        "use strict";
 
         function UPCEReader() {
             EANReader.call(this);
@@ -7249,7 +7261,7 @@ define('barcode_decoder',[
     UPCReader,
     EAN8Reader,
     UPCEReader) {
-    
+    "use strict";
     
     var readers = {
         code_128_reader: Code128Reader,
@@ -7526,7 +7538,7 @@ define('barcode_decoder',[
 /* global define */
 
 define('frame_grabber',["cv_utils"], function(CVUtils) {
-    
+    "use strict";
 
     var FrameGrabber = {};
 
@@ -7619,7 +7631,7 @@ define('frame_grabber',["cv_utils"], function(CVUtils) {
 /* global define */
 
 define('html_utils',[], function() {
-    
+    "use strict";
 
     function createNode(htmlStr) {
         var temp = document.createElement('div');
@@ -7710,7 +7722,7 @@ define('config',[],function(){
 /* global define */
 
 define('events',[],function() {
-    
+    "use strict";
 
     var _events = function() {
         var events = {};
@@ -7801,8 +7813,9 @@ define('events',[],function() {
 /* global define, MediaStreamTrack */
 
 define('camera_access',["html_utils"], function(HtmlUtils) {
-    
+    "use strict";
-    var streamRef;
+    var streamRef,
+        loadedDataHandler;
     
     /**
      * Wraps browser-specific getUserMedia
@@ -7818,17 +7831,7 @@ define('camera_access',["html_utils"], function(HtmlUtils) {
         }, failure);
     }
 
-    /**
+    function loadedData(video, callback) {
-     * Tries to attach the camera-stream to a given video-element
-     * and calls the callback function when the content is ready
-     * @param {Object} constraints
-     * @param {Object} video
-     * @param {Object} callback
-     */
-    function initCamera(constraints, video, callback) {
-        getUserMedia(constraints, function(src) {
-            video.src = src;
-            video.addEventListener('loadeddata', function() {
         var attempts = 10;
 
         function checkVideo() {
@@ -7844,9 +7847,24 @@ define('camera_access',["html_utils"], function(HtmlUtils) {
             }
             attempts--;
         }
-
         checkVideo();
-            }, false);
+    }
+
+    /**
+     * Tries to attach the camera-stream to a given video-element
+     * and calls the callback function when the content is ready
+     * @param {Object} constraints
+     * @param {Object} video
+     * @param {Object} callback
+     */
+    function initCamera(constraints, video, callback) {
+        getUserMedia(constraints, function(src) {
+            video.src = src;
+            if (loadedDataHandler) {
+                video.removeEventListener("loadeddata", loadedDataHandler, false);
+            }
+            loadedDataHandler = loadedData.bind(null, video, callback);
+            video.addEventListener('loadeddata', loadedDataHandler, false);
             video.play();
         }, function(e) {
             console.log(e);
@@ -7957,7 +7975,7 @@ function(Code128Reader,
          CameraAccess,
          ImageDebug,
          CVUtils) {
-    
+    "use strict";
     
     var _inputStream,
         _framegrabber,
@@ -8335,8 +8353,14 @@ function(Code128Reader,
         },
         stop : function() {
             _stopped = true;
+            _workerPool.forEach(function(workerThread) {
+                workerThread.worker.terminate();
+                console.log("Worker terminated!");
+            });
+            _workerPool.length = 0;
             if (_config.inputStream.type === "LiveStream") {
                 CameraAccess.release();
+                _inputStream.clearEventHandlers();
             }
         },
         pause: function() {

src/camera_access.js

@@ -3,7 +3,8 @@
 
 define(["html_utils"], function(HtmlUtils) {
     "use strict";
-    var streamRef;
+    var streamRef,
+        loadedDataHandler;
     
     /**
      * Wraps browser-specific getUserMedia
@@ -19,17 +20,7 @@ define(["html_utils"], function(HtmlUtils) {
         }, failure);
     }
 
-    /**
+    function loadedData(video, callback) {
-     * Tries to attach the camera-stream to a given video-element
-     * and calls the callback function when the content is ready
-     * @param {Object} constraints
-     * @param {Object} video
-     * @param {Object} callback
-     */
-    function initCamera(constraints, video, callback) {
-        getUserMedia(constraints, function(src) {
-            video.src = src;
-            video.addEventListener('loadeddata', function() {
         var attempts = 10;
 
         function checkVideo() {
@@ -45,9 +36,24 @@ define(["html_utils"], function(HtmlUtils) {
             }
             attempts--;
         }
-
         checkVideo();
-            }, false);
+    }
+
+    /**
+     * Tries to attach the camera-stream to a given video-element
+     * and calls the callback function when the content is ready
+     * @param {Object} constraints
+     * @param {Object} video
+     * @param {Object} callback
+     */
+    function initCamera(constraints, video, callback) {
+        getUserMedia(constraints, function(src) {
+            video.src = src;
+            if (loadedDataHandler) {
+                video.removeEventListener("loadeddata", loadedDataHandler, false);
+            }
+            loadedDataHandler = loadedData.bind(null, video, callback);
+            video.addEventListener('loadeddata', loadedDataHandler, false);
             video.play();
         }, function(e) {
             console.log(e);

src/ean_reader.js

@@ -196,6 +196,7 @@ define(
                     return endInfo;
                 }
             }
+            return null;
         };
 
         EANReader.prototype._findEnd = function(offset, isWhite) {
@@ -261,7 +262,7 @@ define(
                 decodedCodes.push(code);
                 code = self._decodePayload(code, result, decodedCodes);
                 code = self._findEnd(code.end, false);
-                if (code === null){
+                if (!code){
                     return null;
                 }
 

src/input_stream.js

@@ -68,6 +68,17 @@ define(["image_loader"], function(ImageLoader) {
             }
         };
 
+        that.clearEventHandlers = function() {
+            _eventNames.forEach(function(eventName) {
+                var handlers = _eventHandlers[eventName];
+                if (handlers && handlers.length > 0) {
+                    handlers.forEach(function(handler) {
+                        video.removeEventListener(eventName, handler);
+                    });
+                }
+            });
+        };
+
         that.trigger = function(eventName, args) {
             var j,
                 handlers = _eventHandlers[eventName];

src/quagga.js

@@ -407,8 +407,14 @@ function(Code128Reader,
         },
         stop : function() {
             _stopped = true;
+            _workerPool.forEach(function(workerThread) {
+                workerThread.worker.terminate();
+                console.log("Worker terminated!");
+            });
+            _workerPool.length = 0;
             if (_config.inputStream.type === "LiveStream") {
                 CameraAccess.release();
+                _inputStream.clearEventHandlers();
             }
         },
         pause: function() {