UnknownObject/quaggaJS
1
0
Fork 0
mirror of https://github.com/serratus/quaggaJS.git synced 2026-08-13 05:31:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added Capability to change readers on the fly

Browse Source
This commit is contained in:
Christoph Oberhofer
2015-01-20 20:42:41 +01:00
parent 9af9a0db7e
commit 091908961f
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/quagga.js
Vendored
+17 -14
View File
@@ -6816,7 +6816,7 @@ define('config',[],function(){
debug: false,
controls: false,
locate: true,
numOfWorkers: 0,
numOfWorkers: 4,
scriptName: 'quagga.js',
visual: {
show: true
@@ -6832,9 +6832,9 @@ define('config',[],function(){
},
locator: {
halfSample: true,
showCanvas: true,
showCanvas: false,
showPatches: false,
showFoundPatches: true,
showFoundPatches: false,
showSkeleton: false,
showLabels: false,
showPatchLabels: false,
@@ -7015,10 +7015,6 @@ define('camera_access',[],function() {
var constraints = {
audio : false,
video : {
mandatory: {
minWidth: 1280,
minHeight: 720
},
optional : [{
sourceId : videoSourceId
}]
@@ -7028,12 +7024,7 @@ define('camera_access',[],function() {
});
} else {
initCamera({
video : {
mandatory: {
minWidth: 1280,
minHeight: 720
}
},
video : true,
audio : false
}, video, callback);
}
@@ -8466,6 +8457,8 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
} else if (e.data.cmd === 'process') {
imageWrapper.data = new Uint8Array(e.data.imageData);
Quagga.start();
} else if (e.data.cmd === 'setReaders') {
Quagga.setReaders(e.data.readers);
}
};
@@ -8498,6 +8491,16 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
return window.URL.createObjectURL(blob);
}
function setReaders(readers) {
if (_decoder) {
_decoder.setReaders(readers);
} else if (_onUIThread && _workerPool.length > 0) {
_workerPool.forEach(function(workerThread) {
workerThread.worker.postMessage({cmd: 'setReaders', readers: readers});
});
}
}
return {
init : function(config, cb, imageWrapper) {
_config = HtmlUtils.mergeObjects(_config, config);
@@ -8525,7 +8528,7 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
Events.subscribe("processed", callback);
},
setReaders: function(readers) {
_decoder.setReaders(readers);
setReaders(readers);
},
canvas : _canvasContainer,
decodeSingle : function(config, resultCallback) {
src/quagga.js
+13 -1
View File
@@ -288,6 +288,8 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
} else if (e.data.cmd === 'process') {
imageWrapper.data = new Uint8Array(e.data.imageData);
Quagga.start();
} else if (e.data.cmd === 'setReaders') {
Quagga.setReaders(e.data.readers);
}
};
@@ -320,6 +322,16 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
return window.URL.createObjectURL(blob);
}
function setReaders(readers) {
if (_decoder) {
_decoder.setReaders(readers);
} else if (_onUIThread && _workerPool.length > 0) {
_workerPool.forEach(function(workerThread) {
workerThread.worker.postMessage({cmd: 'setReaders', readers: readers});
});
}
}
return {
init : function(config, cb, imageWrapper) {
_config = HtmlUtils.mergeObjects(_config, config);
@@ -347,7 +359,7 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
Events.subscribe("processed", callback);
},
setReaders: function(readers) {
_decoder.setReaders(readers);
setReaders(readers);
},
canvas : _canvasContainer,
decodeSingle : function(config, resultCallback) {