use better algorithms

Use the ones recommended in FACE AND FACIAL FEATURE DETECTION EVALUATION
botriot · Aug 3, 2012 · 26292e2 · 26292e2
1 parent 335d42a
commit 26292e2
Show file tree

Hide file tree

Showing 8 changed files with 167,642 additions and 8 deletions.
diff --git a/cv/EP3.xml b/cv/EP3.xml
diff --git a/cv/FA2.xml b/cv/FA2.xml
diff --git a/cv/LE.xml b/cv/LE.xml
diff --git a/cv/M1.xml b/cv/M1.xml
diff --git a/cv/N2.xml b/cv/N2.xml
diff --git a/cv/RE.xml b/cv/RE.xml
diff --git a/lib/image.js b/lib/image.js
@@ -27,7 +27,7 @@ function cvDetect(im, name, callback) {
     queue.push(arguments)
   } else {
     inUse = true
-    im.detectObject('./node_modules/opencv/data/'+name+'.xml', {min: [20, 20]}, function(err, faces) {
+    im.detectObject('./cv/'+name+'.xml', {min: [20, 20]}, function(err, faces) {
       inUse = false
       queue.forEach(function(args) {
         process.nextTick(function() {
@@ -106,7 +106,7 @@ var faceApis = {
           return imScaleMap[i]
         }
 
-        cvDetect(im, 'haarcascade_frontalface_alt2', function(err, faces) {
+        cvDetect(im, 'FA2', function(err, faces) {
           console.log(faces)
           async.forEach(faces, function(face, callback) {
             var scale = 1
@@ -123,12 +123,12 @@ var faceApis = {
             var face2 = face
             async.parallel(
               {
-                eyeglasses: async.apply(cvDetectSub, fim, cut(face2, {height: 0.5}), 'haarcascade_eye_tree_eyeglasses'),
-                eyepair: async.apply(cvDetectSub, fim, cut(face2, {height: 0.6}), 'haarcascade_mcs_eyepair_small'),
-                eye_left: async.apply(cvDetectSub, fim, cut(face2, {width: 0.6}), 'haarcascade_righteye_2splits'),
-                eye_right: async.apply(cvDetectSub, fim, cut(face2, {x: 0.4, width: 0.6}), 'haarcascade_lefteye_2splits'),
-                mouth: async.apply(cvDetectSub, fim, cut(face2, {x: 0.3, width: 0.4, y:0.5, height: 0.8}), 'haarcascade_mcs_mouth'),
-                nose: async.apply(cvDetectSub, fim, cut(face2, {x: 0.2, width: 0.6, y: 0.2, height: 0.6}), 'haarcascade_mcs_nose'),
+                // eyeglasses: async.apply(cvDetectSub, fim, cut(face2, {height: 0.5}), 'haarcascade_eye_tree_eyeglasses'),
+                eyepair: async.apply(cvDetectSub, fim, cut(face2, {height: 0.6}), 'EP3'),
+                eye_left: async.apply(cvDetectSub, fim, cut(face2, {width: 0.6}), 'LE'),
+                eye_right: async.apply(cvDetectSub, fim, cut(face2, {x: 0.4, width: 0.6}), 'RE'),
+                mouth: async.apply(cvDetectSub, fim, cut(face2, {x: 0.3, width: 0.4, y:0.5, height: 0.8}), 'M1'),
+                nose: async.apply(cvDetectSub, fim, cut(face2, {x: 0.2, width: 0.6, y: 0.2, height: 0.6}), 'N2'),
               },
               function(err, results) {
                 if (err) return callback("Failed for: + face: " + (err.stack || err))

diff --git a/public/image/test.jpg b/public/image/test.jpg