From da5f42c998aaad43386ebcad7ae07566f33b7d0b Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 28 十二月 2016 12:22:28 +0800
Subject: [PATCH] 

---
 RtspFace/demo/faceAPI.cpp |   70 +++++++++--------------------------
 1 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/RtspFace/demo/faceAPI.cpp b/RtspFace/demo/faceAPI.cpp
index c49a42c..19a466d 100644
--- a/RtspFace/demo/faceAPI.cpp
+++ b/RtspFace/demo/faceAPI.cpp
@@ -1,13 +1,14 @@
-#include "faceAPI.h"
+锘�#include "faceAPI.h"
 #include "faceDB.h"
 
-faceDB fdb = faceDB();
+faceDB *fdb;
 faceAPI::faceAPI(){
-	//创建静态人脸识别句柄,同时创建状态标量
+	//鍒涘缓闈欐�佷汉鑴歌瘑鍒彞鏌勶紝鍚屾椂鍒涘缓鐘舵�佹爣閲�
 	cv_result_t cv_result = 0;
-	cv_face_create_detector(&handle_detect, NULL, CV_DETECT_ENABLE_ALIGN_21);
-	cv_verify_create_handle(&handle_verify1, "verify.model");
+	
+	//cv_verify_create_handle(&handle_verify1, "verify.model");
 	//faceDB* f_db = faceDB.GetInstance();
+	fdb=new faceDB();
 }
 
 faceAPI::~faceAPI(){
@@ -15,12 +16,12 @@
 }
 
 int faceAPI::do_reasch(cv::Mat image){
-	if (!image.data) {
-		fprintf(stderr, "fail to read img\n");
-		return -1;
+	if (!image.data) {
+		fprintf(stderr, "fail to read img\n");
+		return -1;
 	}else
 		fprintf(stderr, "read img\n");
-	p_f = extract_feature(image);
+	p_f = fdb->extract_feature(image);
 	if (!p_f)
 	{
 		fprintf(stderr, "p_f is null\n");
@@ -35,7 +36,7 @@
 }
 
 int faceAPI::do_register(cv::Mat image){
-	p_f = extract_feature(image);
+	p_f = fdb->extract_feature(image);
 	//db add
 	int indx = 1;
 	return indx;
@@ -45,55 +46,20 @@
 int faceAPI::p_img_search(cv_feature_t *p_feature){
 	std::cout<<"p img search"<<std::endl;
 	
-	return fdb.search_db(p_feature);
+	return fdb->search_db(p_feature);
 }
 
-cv_feature_t* faceAPI::extract_feature(const cv::Mat image_color) {
-
-	if (handle_verify1 != NULL)
-	{
-		fprintf(stderr, "handle_verify1 is not null!\n");
-	} 
-	else
-	{
-		fprintf(stderr, "handle_verify1 is null!\n");
-	}
-
-	cv_feature_t *p_feature = NULL;
-	cv_face_t *p_face = NULL;
-	int face_count = 0;
-	cv_result_t st_result = CV_OK;
-	st_result = cv_face_detect(handle_detect, image_color.data, CV_PIX_FMT_BGR888,
-		image_color.cols, image_color.rows, image_color.step,
-		CV_FACE_UP, &p_face, &face_count);
-	if (face_count >= 1) {
-		st_result = cv_verify_get_feature(handle_verify1,
-			(unsigned char *)image_color.data, CV_PIX_FMT_BGR888,
-			image_color.cols, image_color.rows, image_color.step,
-			p_face, &p_feature, NULL);
-		if (st_result != CV_OK) {
-			fprintf(stderr, "cv_verify_get_feature failed, error code %d\n", st_result);
-		}
-	} else {
-		fprintf(stderr, "can't find face in ");
-	}
-	// release the memory of face
-	cv_face_release_detector_result(p_face, face_count);
-	return p_feature;
-}
-
-
-//@brief 特征值转换为字符串
-//@param 特征值
-//@return 字符串格式的特征值
+//@brief 鐗瑰緛鍊艰浆鎹负瀛楃涓�
+//@param 鐗瑰緛鍊�
+//@return 瀛楃涓叉牸寮忕殑鐗瑰緛鍊�
 int faceAPI::get_char(cv_feature_t *p_feature,char* feature_str){
 
 	return cv_verify_serialize_feature(p_feature,feature_str);
 }
 
-//@brief 字符串转换为特征值
-//@param 字符串格式的特征值
-//@return 特征值
+//@brief 瀛楃涓茶浆鎹负鐗瑰緛鍊�
+//@param 瀛楃涓叉牸寮忕殑鐗瑰緛鍊�
+//@return 鐗瑰緛鍊�
 int faceAPI::get_feature(char *feature_str,cv_feature_t *p_feature){
 
 	p_feature = cv_verify_deserialize_feature(feature_str);

--
Gitblit v1.8.0