UnknownObject
/
quaggaJS
mirror of https://github.com/serratus/quaggaJS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed web-workers

Browse Source
feature/image-source
Christoph Oberhofer 8 years ago
parent eb858d0c63
commit 4a56fff2cb
3 changed files with 74 additions and 83 deletions
Show Stats Download Patch File Download Diff File

2
example/live_w_locator.js
Unescape Escape View File

@ -3,11 +3,11 @@ $(function() {
init : function() {
this.overlay = document.querySelector('#interactive canvas.drawing');
this.state.inputStream.constraints.zoom = {exact: 2};
Quagga.fromCamera({
constraints: this.state.inputStream.constraints,
locator: this.state.locator,
decoder: this.state.decoder,
numOfWorkers: this.state.numOfWorkers,
}).then(function(scanner) {
this.scanner = scanner;
this.scanner

12
src/input/PixelCapture.js
Unescape Escape View File

@ -73,7 +73,7 @@ export function fromSource(source, {target = "#interactive.viewport"} = {}) {
}
return {
grabFrameData: function grabFrameData() {
grabFrameData: function grabFrameData({buffer, clipping}) {
const {viewport, canvas: canvasSize} = source.getDimensions();
const sx = viewport.x;
const sy = viewport.y;
@ -93,12 +93,12 @@ export function fromSource(source, {target = "#interactive.viewport"} = {}) {
ctx.drawImage(drawable, sx, sy, sWidth, sHeight, dx, dy, dWidth, dHeight);
}
var imageData = ctx.getImageData(0, 0, $canvas.width, $canvas.height).data;
var buffer = nextAvailableBuffer();
computeGray(imageData, buffer);
var imageBuffer = buffer ? buffer : nextAvailableBuffer();
computeGray(imageData, imageBuffer);
return Promise.resolve({
width: $canvas.width,
height: $canvas.height,
data: buffer,
data: imageBuffer,
});
},
getSource: function() {
@ -107,5 +107,9 @@ export function fromSource(source, {target = "#interactive.viewport"} = {}) {
getCanvas: function() {
return $canvas;
},
getCaptureSize() {
return source.getDimensions().canvas;
},
};
}

143
src/scanner.js
Unescape Escape View File

@ -35,53 +35,43 @@ function createScanner(pixelCapturer) {
_config = {},
_events = createEventedElement(),
_locator;
const source = pixelCapturer.getSource();
function initializeData(imageWrapper) {
initBuffers(imageWrapper);
_decoder = BarcodeDecoder.create(_config.decoder, _inputImageWrapper);
}
const source = pixelCapturer ? pixelCapturer.getSource() : {};
function canRecord(cb) {
function setup() {
// checkImageConstraints(_inputStream, _config.locator);
// initCanvas();
// _framegrabber = FrameGrabber.create(_inputStream, _canvasContainer.dom.image);
adjustWorkerPool(_config.numOfWorkers, function() {
return adjustWorkerPool(_config.numOfWorkers)
.then(() => {
if (_config.numOfWorkers === 0) {
initializeData();
}
ready(cb);
});
}
function ready(cb){
// _inputStream.play();
cb();
function initializeData(imageWrapper) {
initBuffers(imageWrapper);
_decoder = BarcodeDecoder.create(_config.decoder, _inputImageWrapper);
}
function initBuffers(imageWrapper) {
// if (imageWrapper) {
// _inputImageWrapper = imageWrapper;
// } else {
const {canvas} = source.getDimensions();
_inputImageWrapper = new ImageWrapper({
x: canvas.width,
y: canvas.height,
});
// }
//
// if (ENV.development) {
// console.log(_inputImageWrapper.size);
// }
// _boxSize = [
// vec2.clone([0, 0]),
// vec2.clone([0, _inputImageWrapper.size.y]),
// vec2.clone([_inputImageWrapper.size.x, _inputImageWrapper.size.y]),
// vec2.clone([_inputImageWrapper.size.x, 0])
// ];
if (imageWrapper) {
_inputImageWrapper = imageWrapper;
} else {
const captureSize = pixelCapturer.getCaptureSize();
_inputImageWrapper = new ImageWrapper({
x: captureSize.width,
y: captureSize.height,
});
}
if (ENV.development) {
console.log(_inputImageWrapper.size);
}
_boxSize = [
vec2.clone([0, 0]),
vec2.clone([0, _inputImageWrapper.size.y]),
vec2.clone([_inputImageWrapper.size.x, _inputImageWrapper.size.y]),
vec2.clone([_inputImageWrapper.size.x, 0])
];
_locator = createLocator(_inputImageWrapper, _config.locator);
}
@ -201,19 +191,14 @@ function createScanner(pixelCapturer) {
availableWorker = _workerPool.filter(function(workerThread) {
return !workerThread.busy;
})[0];
if (availableWorker) {
//_framegrabber.attachData(availableWorker.imageData);
} else {
return; // all workers are busy
if (!availableWorker) {
return Promise.resolve();
}
} else {
//_framegrabber.attachData(_inputImageWrapper.data);
}
return pixelCapturer.grabFrameData()
const buffer = availableWorker ? availableWorker.imageData : _inputImageWrapper.data;
return pixelCapturer.grabFrameData({buffer})
.then((bitmap) => {
if (bitmap) {
_inputImageWrapper.data = bitmap.data;
if (availableWorker) {
availableWorker.busy = true;
availableWorker.worker.postMessage({
@ -230,7 +215,7 @@ function createScanner(pixelCapturer) {
});
}
return locateAndDecode();
return Promise.resolve(locateAndDecode());
}
function startContinuousUpdate() {
@ -262,14 +247,14 @@ function createScanner(pixelCapturer) {
}
function initWorker(cb) {
var blobURL,
workerThread = {
worker: undefined,
imageData: new Uint8Array(_inputStream.getWidth() * _inputStream.getHeight()),
busy: true
};
blobURL = generateWorkerBlob();
const captureSize = pixelCapturer.getCaptureSize();
const workerThread = {
worker: undefined,
imageData: new Uint8Array(captureSize.width * captureSize.height),
busy: true
};
const blobURL = generateWorkerBlob();
workerThread.worker = new Worker(blobURL);
workerThread.worker.onmessage = function(e) {
@ -294,7 +279,7 @@ function createScanner(pixelCapturer) {
workerThread.worker.postMessage({
cmd: 'init',
size: {x: _inputStream.getWidth(), y: _inputStream.getHeight()},
size: {x: captureSize.width, y: captureSize.height},
imageData: workerThread.imageData,
config: configForWorker(_config)
}, [workerThread.imageData.buffer]);
@ -375,33 +360,35 @@ function createScanner(pixelCapturer) {
}
}
function adjustWorkerPool(capacity, cb) {
const increaseBy = capacity - _workerPool.length;
if (increaseBy === 0) {
return cb && cb();
}
if (increaseBy < 0) {
const workersToTerminate = _workerPool.slice(increaseBy);
workersToTerminate.forEach(function(workerThread) {
workerThread.worker.terminate();
if (ENV.development) {
console.log("Worker terminated!");
}
});
_workerPool = _workerPool.slice(0, increaseBy);
return cb && cb();
} else {
for (var i = 0; i < increaseBy; i++) {
initWorker(workerInitialized);
function adjustWorkerPool(capacity) {
return new Promise((resolve) => {
const increaseBy = capacity - _workerPool.length;
if (increaseBy === 0) {
return resolve();
}
if (increaseBy < 0) {
const workersToTerminate = _workerPool.slice(increaseBy);
workersToTerminate.forEach(function(workerThread) {
workerThread.worker.terminate();
if (ENV.development) {
console.log("Worker terminated!");
}
});
_workerPool = _workerPool.slice(0, increaseBy);
return resolve();
} else {
for (var i = 0; i < increaseBy; i++) {
initWorker(workerInitialized);
}
function workerInitialized(workerThread) {
_workerPool.push(workerThread);
if (_workerPool.length >= capacity){
cb && cb();
function workerInitialized(workerThread) {
_workerPool.push(workerThread);
if (_workerPool.length >= capacity){
resolve();
}
}
}
}
});
}
return {
@ -413,7 +400,7 @@ function createScanner(pixelCapturer) {
initializeData(imageWrapper);
return cb();
} else {
canRecord(cb);
return setup().then(cb);
}
},
start: function() {

Write Preview
Loading…
Cancel
Save