remove obsolete code from worker.js

This commit is contained in:
ajuvercr 2018-10-31 15:30:01 +01:00
parent 83eaeff984
commit f2942269d2

View file

@ -3,16 +3,6 @@ var face_cascade, eye_cascade;
function loadFaceDetectTrainingSet() { function loadFaceDetectTrainingSet() {
if (face_cascade == undefined) { if (face_cascade == undefined) {
face_cascade = new cv.CascadeClassifier(); face_cascade = new cv.CascadeClassifier();
let load = face_cascade.load('../../test/data/haarcascade_frontalface_default.xml');
// console.log('load face detection training data', load);
}
}
function loadEyesDetectTrainingSet() {
if (eye_cascade == undefined) {
eye_cascade = new cv.CascadeClassifier();
let load = eye_cascade.load('../../test/data/haarcascade_eye.xml');
// console.log('load eye detection training data', load);
} }
} }
@ -48,73 +38,11 @@ function faceDetect(imageData) {
img_gray.delete(); img_gray.delete();
} }
function eyesDetect(imageData) {
loadFaceDetectTrainingSet();
loadEyesDetectTrainingSet();
let img = cv.matFromArray(imageData, 24); // 24 for rgba
let img_gray = new cv.Mat();
cv.cvtColor(img, img_gray, cv.ColorConversionCodes.COLOR_RGBA2GRAY.value, 0);
let faces = new cv.RectVector();
let s1 = [0, 0];
let s2 = [0, 0];
face_cascade.detectMultiScale(img_gray, faces, 1.1, 3, 0, s1, s2);
let rects = [];
for (let i = 0; i < faces.size(); i += 1) {
let faceRect = faces.get(i);
let x = faceRect.x;
let y = faceRect.y;
let w = faceRect.width;
let h = faceRect.height;
rects.push({
x: x,
y: y,
width: w,
height: h
});
let roiRect = new cv.Rect(x, y, w, h);
let roi_gray = img_gray.getROI_Rect(roiRect);
let eyes = new cv.RectVector();
eye_cascade.detectMultiScale(roi_gray, eyes, 1.1, 3, 0, s1, s2);
for (let j = 0; j < eyes.size(); j += 1) {
let eyeRect = eyes.get(j);
rects.push({
x: x + eyeRect.x,
y: y + eyeRect.y,
width: eyeRect.width,
height: eyeRect.height
});
}
eyes.delete();
roi_gray.delete();
}
postMessage({ features: rects });
img.delete();
faces.delete();
img_gray.delete();
}
self.onmessage = function (e) { self.onmessage = function (e) {
switch (e.data.cmd) { switch (e.data.cmd) {
case 'faceDetect': case 'faceDetect':
faceDetect(e.data.img); faceDetect(e.data.img);
break; break;
case 'eyesDetect': {
eyesDetect(e.data.img);
break;
}
} }
} }