From 734e1a94bc026ba8e7e71de0a9ddabe12e07b13b Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 11 一月 2017 19:28:58 +0800
Subject: [PATCH]
---
RtspFace/SensetimeFaceAPIWrapper/src/faceAPI.cpp | 98 ++++++++++++++++++++++++++++++-------------------
1 files changed, 60 insertions(+), 38 deletions(-)
diff --git a/RtspFace/SensetimeFaceAPIWrapper/src/faceAPI.cpp b/RtspFace/SensetimeFaceAPIWrapper/src/faceAPI.cpp
index 08fbb17..2c61cff 100644
--- a/RtspFace/SensetimeFaceAPIWrapper/src/faceAPI.cpp
+++ b/RtspFace/SensetimeFaceAPIWrapper/src/faceAPI.cpp
@@ -1,16 +1,17 @@
锘�#include "faceAPI.h"
+#include <iostream>
-faceDB *fdb;
-faceAPI::faceAPI()
+FaceDB *fdb;
+FaceAPI::FaceAPI()
{
//鍒涘缓闈欐�佷汉鑴歌瘑鍒彞鏌勶紝鍚屾椂鍒涘缓鐘舵�佹爣閲�
cv_result_t cv_result = 0;
- //faceDB* f_db = faceDB.GetInstance();
- fdb=new faceDB();
+ //FaceDB* f_db = FaceDB.GetInstance();
+ fdb=new FaceDB();
}
-faceAPI::~faceAPI()
+FaceAPI::~FaceAPI()
{
}
@@ -18,7 +19,7 @@
//@brief 鎼滅储鍔熻兘
//@param 鍥剧墖
//@return 浜鸿劯id
-int faceAPI::do_reasch(cv::Mat image)
+int FaceAPI::do_reasch(cv::Mat image)
{
if (!image.data) {
fprintf(stderr, "fail to read img\n");
@@ -37,7 +38,7 @@
//@brief 鎼滅储鍔熻兘
//@param 瀛楃涓叉牸寮忕殑鐗瑰緛鍊�
//@return 浜鸿劯id
-int faceAPI::do_reasch(char* s_feature)
+int FaceAPI::do_reasch(char* s_feature)
{
get_feature(s_feature,p_f);
return p_img_search(p_f);
@@ -46,7 +47,7 @@
//@brief 娉ㄥ唽鍔熻兘
//@param 鍥剧墖
//@return 浜鸿劯id
-int faceAPI::do_register(cv::Mat image)
+int FaceAPI::do_register(cv::Mat image)
{
p_f = fdb->extract_feature(image);
int indx = fdb->db_add(p_f);
@@ -58,7 +59,7 @@
//@brief 鍦ㄦ暟鎹簱涓悳绱汉鑴竔d
//@param 鐗瑰緛鍊�
//@return 浜鸿劯id
-int faceAPI::p_img_search(cv_feature_t *p_feature)
+int FaceAPI::p_img_search(cv_feature_t *p_feature)
{
std::cout<<"p img search"<<std::endl;
@@ -69,7 +70,7 @@
//@param 鐗瑰緛鍊�
//@param 瀛楃涓叉牸寮忕殑鐗瑰緛鍊�
//@return 鐘舵�侀噺
-int faceAPI::get_char(cv_feature_t *p_feature,char* feature_str)
+int FaceAPI::get_char(cv_feature_t *p_feature,char* feature_str)
{
return cv_verify_serialize_feature(p_feature,feature_str);
@@ -79,7 +80,7 @@
//@param 瀛楃涓叉牸寮忕殑鐗瑰緛鍊�
//@param 鐗瑰緛鍊�
//@return 鐘舵�侀噺
-int faceAPI::get_feature(char *feature_str,cv_feature_t *p_feature)
+int FaceAPI::get_feature(char *feature_str,cv_feature_t *p_feature)
{
p_feature = cv_verify_deserialize_feature(feature_str);
@@ -90,45 +91,64 @@
}
//faceDB瀹炵幇閮ㄥ垎
-#include <iostream>
-
//"./out1.db"
-char *db_path = "out.db";
-
-faceDB::faceDB()
+//char *db_path = "out.db";
+FaceDB::FaceDB()
{
- // 鍒涘缓浜鸿劯鏁版嵁搴撳彞鏌�
- cv_verify_create_db(&handle_db);
- fprintf(stderr, "create cv_verify_create_db\n");
+
+}
+
+FaceDB::~FaceDB() {}
+
+//鍒濆鍖栬缃�
+bool FaceDB::init(char* db_path_t)
+{
+
+ db_path = db_path_t;
+
+ //鍔犺浇涓�娆″彲澶氭浣跨敤銆�
cv_verify_create_handle(&handle_verify, "../models/verify.model");
fprintf(stderr, "create cv_verify_create_handle\n");
cv_face_create_detector(&handle_detect, NULL, CV_DETECT_ENABLE_ALIGN_21);
fprintf(stderr, "create cv_face_create_detector\n");
- db_load();
- fprintf(stderr, "db load\n");
+
+
+ // 鍒涘缓浜鸿劯鏁版嵁搴撳彞鏌勶紝鍦╠b_save()涓紝鏁版嵁搴撲繚瀛樻垚鍔燂紝浼氶噴鏀捐鍙ユ焺
+ cv_verify_create_db(&handle_db);
+ fprintf(stderr, "create cv_verify_create_db\n");
+
+
+ if(db_load())
+ {
+ fprintf(stderr, "db load\n");
+ return true;
+ }
+ fprintf(stderr, "db load falied\n");
+ return false;
}
-faceDB::~faceDB() {}
-
-/*
-faceDB* faceDB::GetInstance(){
- if (db == NULL)
+//璋冪敤鏁版嵁搴撲繚瀛�
+bool FaceDB::finally()
+{
+ if(db_save())
{
- db = new faceDB();
+ return true;
}
-
- return db;
-}*/
-
+
+ return false;
+
+}
+
//@brief 鏁版嵁搴撴坊鍔犳暟鎹�
//@param 鐗瑰緛鍊�
-//@return 浜鸿劯id
-int faceDB::db_add(cv_feature_t* p_feature)
+//@return 浜鸿劯id锛屾坊鍔犲け璐ヨ繑鍥�-1
+int FaceDB::db_add(cv_feature_t* p_feature)
{
int idx;
cv_result_t cv_result = cv_verify_add_face(handle_db, p_feature, &idx);
if (cv_result != CV_OK) {
fprintf(stderr, "cv_verify_add_face failed, error code %d\n", cv_result);
+ return -1;
}
cv_verify_release_feature(p_feature);
return idx;
@@ -137,7 +157,7 @@
//@brief 淇濆瓨鏁版嵁搴�
//@return 鐘舵�侀噺
-bool faceDB::db_save()
+bool FaceDB::db_save()
{
cv_result = cv_verify_save_db(handle_db, db_path);
if (cv_result != CV_OK) {
@@ -146,13 +166,13 @@
} else {
fprintf(stderr, "save done!\n");
}
-
+ cv_verify_destroy_db(handle_db);
return true;
}
//@brief 鍔犺浇鏁版嵁搴�
//@return 鐘舵�侀噺
-bool faceDB::db_load()
+bool FaceDB::db_load()
{
if (handle_db != NULL) {
fprintf(stderr, "handle_db is not null!%s\n",db_path);
@@ -173,7 +193,7 @@
//@brief 鎼滅储鏁版嵁搴�
//@param 浜鸿劯鐗瑰緛鍊�
//@return 浜鸿劯id
-int faceDB::search_db(cv_feature_t *p_feature)
+int FaceDB::search_db(cv_feature_t *p_feature)
{
int indx=-1;
//鏌ヨ鍓�10鏉�
@@ -215,7 +235,7 @@
//@brief 鎻愬彇鐗瑰緛鍊�
//@param 鍥剧墖
//@return 鐗瑰緛鍊�
-cv_feature_t* faceDB::extract_feature(cv::Mat image_color)
+cv_feature_t* FaceDB::extract_feature(cv::Mat image_color)
{
if (handle_verify != NULL) {
fprintf(stderr, "fdb.handle_verify is not null!\n");
@@ -223,7 +243,9 @@
fprintf(stderr, "fdb.handle_verify is null!\n");
}
+ //璇ュ彉閲忓唴瀛樹細鍦╠b_add()涓紝娣诲姞鎴愬姛鍚庨噴鏀俱��
cv_feature_t *p_feature = NULL;
+
cv_face_t *p_face = NULL;
int face_count = 0;
cv_result_t st_result = CV_OK;
--
Gitblit v1.8.0