hzt_asc 1.0.7 → 1.0.8

package/ask.cc

@@ -92,7 +92,7 @@ ASK::ASK(const Napi::CallbackInfo& info) : Napi::ObjectWrap<ASK>(info) {
 
 ASK::~ASK()
 {
-    delete []mFeatureInfoList;
+    // delete []mFeatureInfoList;
     ASFUninitEngine(this->handle);
     printf("ASK end\n");
 }
@@ -142,7 +142,6 @@ Napi::Value ASK::faceDetect(const Napi::CallbackInfo& info) {
     return obj;
 }
 
-
 Napi::Value ASK::faceDetectUrl(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     int length = info.Length();
@@ -176,8 +175,6 @@ Napi::Value ASK::faceDetectUrl(const Napi::CallbackInfo& info) {
     return obj;
 }
 
-
-
 Napi::Value ASK::faceFeatureExtract(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     int length = info.Length();
@@ -284,7 +281,6 @@ Napi::Value ASK::faceFeatureExtractUrl(const Napi::CallbackInfo& info) {
     return obj;
 }
 
-
 Napi::Value ASK::faceFeatureInfo(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     int length = info.Length();
@@ -335,7 +331,6 @@ void strToFeatureInfo(string& feature, ASF_FaceFeature& featureInfo) {
     featureInfo.feature = reinterpret_cast<MByte*>(feature11);
 }
 
-
 Napi::Value ASK::faceFeatureCompare(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     //printf("AcceptArrayBuffer from js %d \n", info.Length());
@@ -368,10 +363,10 @@ Napi::Value ASK::faceFeatureCompare(const Napi::CallbackInfo& info) {
 
 }
 
-
-bool compareScore(MFaceSore& a, MFaceSore& b){
-    if (b.score > a.score) return false;
-    return true;
+bool compareScore(const MFaceSore& a, const MFaceSore& b){
+    // if (b.score > a.score) return false;
+    // return true;
+    return a.score > b.score;//
 }
 
 Napi::Value ASK::ImageFaceCompare(const Napi::CallbackInfo& info) {
@@ -422,7 +417,7 @@ Napi::Value ASK::ImageFaceCompare(const Napi::CallbackInfo& info) {
         
         ASF_FaceFeatureInfo* info = new ASF_FaceFeatureInfo();
         info->searchId = searchId;
-        info->tag = (*tag).c_str();
+        info->tag = *tag; //(*tag).c_str();
         info->feature = featureInfo;
         featureInfoList[i] = *info;
     }
@@ -483,27 +478,80 @@ Napi::Value ASK::RegisterFaces(const Napi::CallbackInfo& info) {
         return errorData(env, "array expected"); 
     }
     Napi::Array arr = info[0].As<Napi::Array>();
+    m_vecFeatureInfoList.clear();
+
     MUInt32 len = arr.Length();
-    ASF_FaceFeatureInfo* featureInfoList = new ASF_FaceFeatureInfo[len];
+    //ASF_FaceFeatureInfo* featureInfoList = new ASF_FaceFeatureInfo[len];
     for(int i = 0; i < len; ++i) {
         Napi::Object obj = static_cast<Napi::Value>(arr[i]).As<Napi::Object>().ToObject();
         MInt32 searchId = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"searchId"))).As<Napi::Number>().Uint32Value();
-        std::string* tag = new std::string();  
-        *tag = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"tag"))).As<Napi::String>().ToString();
-        //Napi::ArrayBuffer buf = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"feature"))).As<Napi::ArrayBuffer>();
+        // std::string* tag = new std::string();  
+        // *tag = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"tag"))).As<Napi::String>().ToString();
+        // //Napi::ArrayBuffer buf = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"feature"))).As<Napi::ArrayBuffer>();
         ASF_FaceFeature* featureInfo = new ASF_FaceFeature();
-        std::string* feature = new std::string();
-        *feature = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"feature"))).As<Napi::String>().ToString();
-        strToFeatureInfo(*feature, *featureInfo);
-        featureInfoList[i].searchId = searchId;
-        featureInfoList[i].tag = (*tag).c_str();
-        featureInfoList[i].feature = featureInfo;
-    }
-    mFeatureInfoList = featureInfoList;
-    mFeatureLen = len;
+        // std::string* feature = new std::string();
+        // *feature = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"feature"))).As<Napi::String>().ToString();
+        std::string strFeature = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"feature"))).As<Napi::String>().ToString();
+        strToFeatureInfo(strFeature, *featureInfo);
+        // featureInfoList[i].searchId = searchId;
+        // featureInfoList[i].tag = *tag; //(*tag).c_str();
+        // featureInfoList[i].feature = featureInfo;
+        ASF_FaceFeatureInfo fInfo = {0};
+        fInfo.searchId = searchId;
+        fInfo.tag = obj.Get(static_cast<napi_value>(Napi::String::New(env,"tag"))).As<Napi::String>().ToString();
+        fInfo.feature = featureInfo;
+        m_vecFeatureInfoList.push_back(fInfo);
+    }
+    // mFeatureInfoList = featureInfoList;
+    // mFeatureLen = len;
     return Napi::Number::New(env, 1);
 }
 
+Napi::Array ASK::faceReg(std::vector<ASF_FaceFeatureInfo>& vecFeatureInfoList, ASF_MultiFaceInfo& detectedFaces, Napi::Env& env, ASVLOFFSCREEN& offscreen) {
+    Napi::Array list = Napi::Array::New(env, detectedFaces.faceNum);
+    for(int i = 0; i < detectedFaces.faceNum; ++i) {
+        ASF_SingleFaceInfo sData;
+        getDetectFaceInfo(detectedFaces, sData, i);
+        ASF_FaceFeature feature = { 0 };
+        MRESULT res = ASFFaceFeatureExtractEx(handle, &offscreen, &sData, &feature);
+        vector<MFaceSore> vecfaceScores;
+        for(int j = 0; j < vecFeatureInfoList.size(); ++j) {
+            ASF_FaceFeatureInfo& fInfo = vecFeatureInfoList[j];
+            MFloat confidenceLevel;	
+            MRESULT res1 = ASFFaceFeatureCompare(this->handle, &feature, fInfo.feature, &confidenceLevel);
+            //cout << " confidenceLevel: " << confidenceLevel;
+            MFaceSore sInfo;
+            sInfo.searchId = fInfo.searchId;
+            sInfo.score = confidenceLevel;
+            sInfo.name = fInfo.tag;
+		    vecfaceScores.push_back(sInfo);
+        }
+        sort(vecfaceScores.begin(), vecfaceScores.end(), compareScore);
+        int ll = vecfaceScores.size() > 3? 3 : vecfaceScores.size();
+        Napi::Array mFaceScores = Napi::Array::New(env, ll);
+        //cout << " i=" << i << ", len=" << ll << ",mFeatureLen=" << vecFeatureInfoList.size() << endl;
+        for(int n = 0; n < ll; ++n) {
+            MFaceSore& sInfo = vecfaceScores[n]; 
+            Napi::Object faceScore = Napi::Object::New(env);
+            faceScore.Set(Napi::String::New(env, "searchId"), sInfo.searchId);
+            faceScore.Set(Napi::String::New(env, "score"), sInfo.score);
+            faceScore.Set(Napi::String::New(env, "name"), sInfo.name);
+            //cout << "name:" << sInfo.name << ",searchId:" << sInfo.searchId << ",score=" << sInfo.score << endl;
+            mFaceScores[n] = faceScore;
+        }
+        Napi::Object data = Napi::Object::New(env);
+        data.Set(Napi::String::New(env, "left"), sData.faceRect.left);
+        data.Set(Napi::String::New(env, "top"), sData.faceRect.top);
+        data.Set(Napi::String::New(env, "right"), sData.faceRect.right);
+        data.Set(Napi::String::New(env, "bottom"), sData.faceRect.bottom);
+        data.Set(Napi::String::New(env, "faceScores"), mFaceScores);
+        list[i] = data;
+        vecfaceScores.clear();
+    }
+    //obj.Set(Napi::String::New(env, "faceRects"), list);
+    return list;
+}
+
 Napi::Value ASK::ImageFaceCompareUrl2(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     int length = info.Length();
@@ -519,53 +567,20 @@ Napi::Value ASK::ImageFaceCompareUrl2(const Napi::CallbackInfo& info) {
     
     ASF_MultiFaceInfo detectedFaces = { 0 };
     MRESULT res = ASFDetectFacesEx(this->handle, &offscreen, &detectedFaces);
-    //return Napi::Number::New(env, 1);
     Napi::Object obj = Napi::Object::New(env);
     obj.Set(Napi::String::New(env, "faceNum"), detectedFaces.faceNum);
     if (0 == detectedFaces.faceNum) {
         SafeFree(imageData);
         return obj;
     }
-    //compare
-    Napi::Array list = Napi::Array::New(env, detectedFaces.faceNum);
-    for(int i = 0; i < detectedFaces.faceNum; ++i) {
-        ASF_SingleFaceInfo sData;
-        getDetectFaceInfo(detectedFaces, sData, i);
-        ASF_FaceFeature feature = { 0 };
-        res = ASFFaceFeatureExtractEx(handle, &offscreen, &sData, &feature);
-        MFaceSore* faceScores = new MFaceSore[mFeatureLen];
-        for(int j = 0; j < mFeatureLen; ++j) {
-            MFloat confidenceLevel;	
-            MRESULT res1 = ASFFaceFeatureCompare(this->handle, &feature, mFeatureInfoList[j].feature, &confidenceLevel);
-            faceScores[j].searchId = mFeatureInfoList[j].searchId;
-            faceScores[j].score = confidenceLevel;
-            faceScores[j].name = mFeatureInfoList[j].tag;
-        }
-        sort(faceScores, faceScores + mFeatureLen, compareScore);
-        int ll = mFeatureLen > 5? 5 : mFeatureLen;
-        Napi::Array mFaceScores = Napi::Array::New(env, ll);
-        for(int n = 0; n < ll; ++n) {
-            Napi::Object faceScore = Napi::Object::New(env);
-            faceScore.Set(Napi::String::New(env, "searchId"), faceScores[n].searchId);
-            faceScore.Set(Napi::String::New(env, "score"), faceScores[n].score);
-            faceScore.Set(Napi::String::New(env, "name"), faceScores[n].name);
-            mFaceScores[n] = faceScore;
-        }
-        Napi::Object data = Napi::Object::New(env);
-        data.Set(Napi::String::New(env, "left"), sData.faceRect.left);
-        data.Set(Napi::String::New(env, "top"), sData.faceRect.top);
-        data.Set(Napi::String::New(env, "right"), sData.faceRect.right);
-        data.Set(Napi::String::New(env, "bottom"), sData.faceRect.bottom);
-        data.Set(Napi::String::New(env, "faceScores"), mFaceScores);
-        list[i] = data;
-        delete []faceScores;
-    }
+    Napi::Array list = faceReg(this->m_vecFeatureInfoList, detectedFaces, env, offscreen);
     obj.Set(Napi::String::New(env, "faceRects"), list);
     SafeFree(imageData);
     return obj;
 }
 
 
+
 Napi::Value ASK::ImageFaceCompareUrl(const Napi::CallbackInfo& info) {
     Napi::Env env = info.Env();
     int length = info.Length();
@@ -584,7 +599,7 @@ Napi::Value ASK::ImageFaceCompareUrl(const Napi::CallbackInfo& info) {
     Napi::Object obj = Napi::Object::New(env);
     obj.Set(Napi::String::New(env, "faceNum"), detectedFaces.faceNum);
     if (0 == detectedFaces.faceNum) {
-        SafeArrayDelete(imageData);
+        SafeFree(imageData);
         return obj;
     }
 
@@ -595,69 +610,26 @@ Napi::Value ASK::ImageFaceCompareUrl(const Napi::CallbackInfo& info) {
     }
     Napi::Array arr = info[1].As<Napi::Array>();
     MUInt32 len = arr.Length();
-    ASF_FaceFeatureInfo* featureInfoList = new ASF_FaceFeatureInfo[len];
+
+    std::vector<ASF_FaceFeatureInfo> vecFeatureInfoList;
     for(int i = 0; i < len; ++i) {
         Napi::Object obj = static_cast<Napi::Value>(arr[i]).As<Napi::Object>().ToObject();
         MInt32 searchId = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"searchId"))).As<Napi::Number>().Uint32Value();
-        std::string* tag = new std::string();  
-        *tag = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"tag"))).As<Napi::String>().ToString();
-        //Napi::ArrayBuffer buf = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"feature"))).As<Napi::ArrayBuffer>();
+        std::string strFeature = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"feature"))).As<Napi::String>().ToString();
         ASF_FaceFeature* featureInfo = new ASF_FaceFeature();
-        std::string* feature = new std::string();
-        *feature = obj.Get(static_cast<napi_value>(Napi::String::New(info.Env(),"feature"))).As<Napi::String>().ToString();
-        strToFeatureInfo(*feature, *featureInfo);
-        // featureInfo->featureSize = buf.ByteLength();
-        // featureInfo->feature = reinterpret_cast<MByte*>(buf.Data());;
-        //ASF_FaceFeatureInfo* info = new ASF_FaceFeatureInfo();
-        featureInfoList[i].searchId = searchId;
-        featureInfoList[i].tag = (*tag).c_str();
-        featureInfoList[i].feature = featureInfo;
-        //featureInfoList[i] = *info;
-    }
-
-    //compare
-    Napi::Array list = Napi::Array::New(env, detectedFaces.faceNum);
-    for(int i = 0; i < detectedFaces.faceNum; ++i) {
-        ASF_SingleFaceInfo sData;
-        getDetectFaceInfo(detectedFaces, sData, i);
-        ASF_FaceFeature feature = { 0 };
-        res = ASFFaceFeatureExtractEx(handle, &offscreen, &sData, &feature);
-        MFaceSore* faceScores = new MFaceSore[len];
-        for(int j = 0; j < len; ++j) {
-            MFloat confidenceLevel;	
-            MRESULT res1 = ASFFaceFeatureCompare(this->handle, &feature, featureInfoList[j].feature, &confidenceLevel);
-            //cout << confidenceLevel <<endl;
-            //MFaceSore* pFace = new MFaceSore();
-            faceScores[j].searchId = featureInfoList[j].searchId;
-            faceScores[j].score = confidenceLevel;
-            faceScores[j].name = featureInfoList[j].tag;
-            // faceScores[j] = *pFace;
-        }
-        sort(faceScores, faceScores + len, compareScore);
-        int ll = len > 5? 5 : len;
-        Napi::Array mFaceScores = Napi::Array::New(env, ll);
-        for(int n = 0; n < ll; ++n) {
-            Napi::Object faceScore = Napi::Object::New(env);
-            faceScore.Set(Napi::String::New(env, "searchId"), faceScores[n].searchId);
-            faceScore.Set(Napi::String::New(env, "score"), faceScores[n].score);
-            faceScore.Set(Napi::String::New(env, "name"), faceScores[n].name);
-            mFaceScores[n] = faceScore;
-        }
-        Napi::Object data = Napi::Object::New(env);
-        data.Set(Napi::String::New(env, "left"), sData.faceRect.left);
-        data.Set(Napi::String::New(env, "top"), sData.faceRect.top);
-        data.Set(Napi::String::New(env, "right"), sData.faceRect.right);
-        data.Set(Napi::String::New(env, "bottom"), sData.faceRect.bottom);
-        data.Set(Napi::String::New(env, "faceScores"), mFaceScores);
-        list[i] = data;
-        delete []faceScores;
-    }
+        strToFeatureInfo(strFeature, *featureInfo);
+        ASF_FaceFeatureInfo fInfo = {0};
+        fInfo.searchId = searchId;
+        fInfo.tag = obj.Get(static_cast<napi_value>(Napi::String::New(env,"tag"))).As<Napi::String>().ToString();
+        fInfo.feature = featureInfo;
+        vecFeatureInfoList.push_back(fInfo);
+    }
+    Napi::Array list = faceReg(vecFeatureInfoList, detectedFaces, env, offscreen);
     obj.Set(Napi::String::New(env, "faceRects"), list);
     SafeFree(imageData);
     for(int i = 0; i < len; ++i) {
-        delete featureInfoList[i].feature;
+        delete vecFeatureInfoList[i].feature;
     }
-    delete []featureInfoList;
     return obj;
 }
 

package/ask.h

@@ -7,6 +7,7 @@
 #include "asvloffscreen.h"
 #include "merror.h"
 #include <string>
+#include <vector>
 typedef struct __face_score
 {
 	MInt32 searchId;
@@ -17,7 +18,8 @@ typedef struct __face_score
 typedef struct{
         MInt32      searchId;       // 唯一标识符
         LPASF_FaceFeature feature;  // 人脸特征值
-        MPCChar     tag;            // 备注
+        std::string tag;
+        //MPCChar     tag;            // 备注
 }ASF_FaceFeatureInfo, *LPASF_FaceFeatureInfo;
 
 class ASK : public Napi::ObjectWrap<ASK> {
@@ -35,7 +37,6 @@ class ASK : public Napi::ObjectWrap<ASK> {
   // Napi::Value RegisterFaceFeature(const Napi::CallbackInfo& info);
   // Napi::Value SearchFaceFeature(const Napi::CallbackInfo& info);
 
-
   Napi::Value ImageFaceCompare(const Napi::CallbackInfo& info);
 
   Napi::Value faceDetectUrl(const Napi::CallbackInfo& info);
@@ -52,13 +53,15 @@ class ASK : public Napi::ObjectWrap<ASK> {
   MUInt8* processFile(const char*  filePath, int& picWidth, int& picHeight);
   //void processFileUrl(const char* filePath,  MUInt8* imageData, ASVLOFFSCREEN& offscreen);
   MUInt8* processFileUrl(const char*  url, int& picWidth, int& picHeight);
+  Napi::Array faceReg(std::vector<ASF_FaceFeatureInfo>& vecFeatureInfoList, ASF_MultiFaceInfo& detectedFaces, Napi::Env& env, ASVLOFFSCREEN& offscreen);
 
   // void mFaceDetect(ASVLOFFSCREEN& offscree, ASF_MultiFaceInfo* detectedFaces);
   // void mFaceFeatureExtract(ASVLOFFSCREEN& offscree, ASF_MultiFaceInfo* detectedFaces);
 
   MHandle handle;
-  ASF_FaceFeatureInfo* mFeatureInfoList;
-  MUInt32 mFeatureLen;
+  // ASF_FaceFeatureInfo* mFeatureInfoList;
+  // MUInt32 mFeatureLen;
+  std::vector<ASF_FaceFeatureInfo> m_vecFeatureInfoList;
 };
 
 #endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hzt_asc",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "main": "index.js",
   "description": "hzt_asc_v3.",
   "author": {