Added Capability to change readers on the fly

pull/12/head
Christoph Oberhofer 11 years ago
parent 9af9a0db7e
commit 091908961f

31
dist/quagga.js vendored

@ -6816,7 +6816,7 @@ define('config',[],function(){
debug: false, debug: false,
controls: false, controls: false,
locate: true, locate: true,
numOfWorkers: 0, numOfWorkers: 4,
scriptName: 'quagga.js', scriptName: 'quagga.js',
visual: { visual: {
show: true show: true
@ -6832,9 +6832,9 @@ define('config',[],function(){
}, },
locator: { locator: {
halfSample: true, halfSample: true,
showCanvas: true, showCanvas: false,
showPatches: false, showPatches: false,
showFoundPatches: true, showFoundPatches: false,
showSkeleton: false, showSkeleton: false,
showLabels: false, showLabels: false,
showPatchLabels: false, showPatchLabels: false,
@ -7015,10 +7015,6 @@ define('camera_access',[],function() {
var constraints = { var constraints = {
audio : false, audio : false,
video : { video : {
mandatory: {
minWidth: 1280,
minHeight: 720
},
optional : [{ optional : [{
sourceId : videoSourceId sourceId : videoSourceId
}] }]
@ -7028,12 +7024,7 @@ define('camera_access',[],function() {
}); });
} else { } else {
initCamera({ initCamera({
video : { video : true,
mandatory: {
minWidth: 1280,
minHeight: 720
}
},
audio : false audio : false
}, video, callback); }, video, callback);
} }
@ -8466,6 +8457,8 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
} else if (e.data.cmd === 'process') { } else if (e.data.cmd === 'process') {
imageWrapper.data = new Uint8Array(e.data.imageData); imageWrapper.data = new Uint8Array(e.data.imageData);
Quagga.start(); 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); 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 { return {
init : function(config, cb, imageWrapper) { init : function(config, cb, imageWrapper) {
_config = HtmlUtils.mergeObjects(_config, config); _config = HtmlUtils.mergeObjects(_config, config);
@ -8525,7 +8528,7 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
Events.subscribe("processed", callback); Events.subscribe("processed", callback);
}, },
setReaders: function(readers) { setReaders: function(readers) {
_decoder.setReaders(readers); setReaders(readers);
}, },
canvas : _canvasContainer, canvas : _canvasContainer,
decodeSingle : function(config, resultCallback) { decodeSingle : function(config, resultCallback) {

@ -288,6 +288,8 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
} else if (e.data.cmd === 'process') { } else if (e.data.cmd === 'process') {
imageWrapper.data = new Uint8Array(e.data.imageData); imageWrapper.data = new Uint8Array(e.data.imageData);
Quagga.start(); 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); 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 { return {
init : function(config, cb, imageWrapper) { init : function(config, cb, imageWrapper) {
_config = HtmlUtils.mergeObjects(_config, config); _config = HtmlUtils.mergeObjects(_config, config);
@ -347,7 +359,7 @@ function(Code128Reader, EANReader, InputStream, ImageWrapper, BarcodeLocator, Ba
Events.subscribe("processed", callback); Events.subscribe("processed", callback);
}, },
setReaders: function(readers) { setReaders: function(readers) {
_decoder.setReaders(readers); setReaders(readers);
}, },
canvas : _canvasContainer, canvas : _canvasContainer,
decodeSingle : function(config, resultCallback) { decodeSingle : function(config, resultCallback) {

Loading…
Cancel
Save