From f757a27218a09fd24a852f34b6490d32fe237017 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 14:47:55 +0800
Subject: [PATCH] dev

---
 FaceServer/sample_face_search.cpp |  111 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/FaceServer/sample_face_search.cpp b/FaceServer/sample_face_search.cpp
index bc11aef..6876364 100644
--- a/FaceServer/sample_face_search.cpp
+++ b/FaceServer/sample_face_search.cpp
@@ -1,4 +1,5 @@
 #include "sample_face_search.h"
+#include "STFaceCache.h"
 #include <logger.h>
 
 #include <vector>
@@ -35,15 +36,17 @@
 						bgr_image.cols, bgr_image.rows, bgr_image.step,
 						p_face, &p_feature, nullptr);
 		if (st_result != CV_OK) {
-			LOGP(INFO, "cv_verify_get_feature failed, error code %d\n", st_result);
+			LOGP(DEBUG, "cv_verify_get_feature failed, error code %d\n", st_result);
 		}
 	} else {
-		LOGP(INFO, "can't find face in %s", image_path);
+		LOGP(DEBUG, "can't find face in %s", image_path);
 	}
 	// release the memory of face
 	cv_face_release_detector_result(p_face, face_count);
 	return p_feature;
 }
+
+cv_feature_t *stface_extract_feature(stface_handles& handles, const STFaceImage& image);//#todo
 
 int stface_db_add(stface_handles& handles, const char *image_path) {
 	cv_feature_t *p_feature = stface_extract_feature(handles, image_path);
@@ -53,50 +56,52 @@
 	int idx;
 	cv_result_t cv_result = cv_verify_add_face(handles.handle_db, p_feature, &idx);
 	if (cv_result != CV_OK) {
-		LOGP(INFO, "cv_verify_add_face failed, error code %d\n", cv_result);
+		LOGP(DEBUG, "cv_verify_add_face failed, error code %d\n", cv_result);
 	}
 	cv_verify_release_feature(p_feature);
 	return idx;
 }
 
+int stface_db_add(stface_handles& handles, const STFaceImage& image);//#todo
+
 bool stface_db_del(stface_handles& handles, int idx) {
 	if (idx < 0) {
-		LOGP(INFO, "invalid idx!\n");
+		LOGP(DEBUG, "invalid idx!\n");
 		return false;
 	}
 	cv_result_t cv_result = CV_OK;
 	cv_result = cv_verify_delete_face(handles.handle_db, idx);
 	if (cv_result != CV_OK) {
-		LOGP(INFO, "cv_verify_delete_face failed, error code %d\n", cv_result);
+		LOGP(DEBUG, "cv_verify_delete_face failed, error code %d\n", cv_result);
 	}
 	else {
-		LOGP(INFO, "delete succeed\n");
+		LOGP(DEBUG, "delete succeed\n");
 	}
 }
 
-bool stface_db_save(stface_handles& handles, char *db_path) {
+bool stface_db_save(stface_handles& handles, const char *db_path) {
 	cv_result_t cv_result = CV_OK;
 	cv_result = cv_verify_save_db(handles.handle_db, db_path);
 	if (cv_result != CV_OK) {
-		LOGP(INFO, "cv_verify_save_db failed, error code %d\n", cv_result);
+		LOGP(DEBUG, "cv_verify_save_db failed, error code %d\n", cv_result);
 		return false;
 	}
 	else {
-		LOGP(INFO, "save done!\n");
+		LOGP(DEBUG, "save done!\n");
 	}
 
 	return true;
 }
 
-bool stface_db_load(stface_handles& handles, char *db_path) {
+bool stface_db_load(stface_handles& handles, const char *db_path) {
 	cv_result_t cv_result = CV_OK;
 	cv_result = cv_verify_load_db(handles.handle_db, db_path);
 	if (cv_result != CV_OK) {
-		LOGP(INFO, "cv_verify_load_db failed, error code %d\n", cv_result);
+		LOGP(DEBUG, "cv_verify_load_db failed, error code %d\n", cv_result);
 		return false;
 	}
 	else {
-		LOGP(INFO, "load done!\n");
+		LOGP(DEBUG, "load done!\n");
 	}
 
 	return true;
@@ -106,7 +111,7 @@
 	bool bresult = true;
 	FILE *fp_path = fopen(image_list, "r");
 	if(!fp_path) {
-		LOGP(INFO, "failed to load %s\n", image_list);
+		LOGP(DEBUG, "failed to load %s\n", image_list);
 		return false;
 	}
 	std::vector<cv_feature_t *> list_feature;
@@ -118,12 +123,12 @@
 			bresult = false;
 			break;
 		}
-		LOGP(INFO, "extracting %s\n", image_path);
+		LOGP(DEBUG, "extracting %s\n", image_path);
 
 		// get the face feature
 		cv_feature_t *p_feature = stface_extract_feature(handles, image_path);
 		if (!p_feature) {
-			LOGP(INFO, "failed to extract image: %s\n", image_path);
+			LOGP(DEBUG, "failed to extract image: %s\n", image_path);
 			continue;
 		}
 		list_feature.push_back(p_feature);
@@ -134,7 +139,7 @@
 	cv_verify_create_db(&handles.handle_db);
 	cv_result = cv_verify_build_db(handles.handle_db, &list_feature[0], list_feature.size());
 	if (cv_result != CV_OK) {
-		LOGP(INFO, "cv_verify_build_db failed, error code %d\n", cv_result);
+		LOGP(DEBUG, "cv_verify_build_db failed, error code %d\n", cv_result);
 		bresult = false;
 	}
 	cv_verify_save_db(handles.handle_db, output_db_path);
@@ -149,14 +154,14 @@
 bool stface_search_db(stface_handles& handles, char *image_path) {
 	FILE *fp_path = fopen(image_path, "r");
 	if (fp_path == nullptr) {
-		LOGP(INFO, "invalid path !\n");
+		LOGP(DEBUG, "invalid path !\n");
 		return false;
 	}
 	fclose(fp_path);
 
 	cv_feature_t *p_feature = stface_extract_feature(handles, image_path);
 	if (p_feature == nullptr) {
-		LOGP(INFO, "extract failed !\n");
+		LOGP(DEBUG, "extract failed !\n");
 		return false;
 	}
 
@@ -170,12 +175,12 @@
 	if (cv_result == CV_OK) {
 		for (unsigned int t = 0; t < result_length; t++) {
 			// const cv_feature_t item = result[t].item;
-			LOGP(INFO, "%d\t", top_idxs[t]);
-			LOGP(INFO, "%0.2f\n", top_scores[t]);
+			LOGP(DEBUG, "%d\t", top_idxs[t]);
+			LOGP(DEBUG, "%0.2f\n", top_scores[t]);
 		}
 	}
 	else {
-		LOGP(INFO, "cv_verify_search_face failed, error code %d\n", cv_result);
+		LOGP(DEBUG, "cv_verify_search_face failed, error code %d\n", cv_result);
 	}
 	if (top_idxs) {
 		delete[]top_idxs;
@@ -188,16 +193,18 @@
 	return true;
 }
 
+bool stface_search_db(stface_handles& handles, const STFaceImage& image, top_idx_score_vect_t& result);//#todo
+
 bool stface_search_list(stface_handles& handles, char *image_path, char *list_path) {
 	cv_feature_t *p_feature = stface_extract_feature(handles, image_path);
 	if (p_feature == nullptr) {
-		LOGP(INFO, "failed to extract image: %s\n", image_path);
+		LOGP(DEBUG, "failed to extract image: %s\n", image_path);
 		return false;
 	}
 
 	FILE *fp_path = fopen(list_path, "r");
 	if(!fp_path) {
-		LOGP(INFO, "failed to load %s\n", list_path);
+		LOGP(DEBUG, "failed to load %s\n", list_path);
 		return false;
 	}
 	std::vector<cv_feature_t *> list_feature;
@@ -208,12 +215,12 @@
 		if (num != 1) {
 			break;
 		}
-		LOGP(INFO, "extracting %s\n", image_path);
+		LOGP(DEBUG, "extracting %s\n", image_path);
 
 		// get the face feature
 		cv_feature_t *p_feature = stface_extract_feature(handles, image_path);
 		if (!p_feature) {
-			LOGP(INFO, "failed to extract image: %s\n", image_path);
+			LOGP(DEBUG, "failed to extract image: %s\n", image_path);
 			continue;
 		}
 		list_feature.push_back(p_feature);
@@ -232,60 +239,60 @@
 
 	if (cv_result == CV_OK) {
 		for (unsigned int t = 0; t < result_length; t++) {
-			LOGP(INFO, "%d\t", top_idxs[t]);
-			LOGP(INFO, "%0.2f\n", top_scores[t]);
+			LOGP(DEBUG, "%d\t", top_idxs[t]);
+			LOGP(DEBUG, "%0.2f\n", top_scores[t]);
 		}
 	} else {
-		LOGP(INFO, "search face failed");
+		LOGP(DEBUG, "search face failed");
 	}
 	cv_verify_release_feature(p_feature);
 
 	for (int i = 0; i < list_feature.size(); i++) {
 		cv_verify_release_feature(list_feature[i]);
 	}
-	LOGP(INFO, "list search done!\n");
+	LOGP(DEBUG, "list search done!\n");
 
 	return true;
 }
 
 void stface_get_help() {
-	LOGP(INFO, "Usage: help | Get cmd list\n");
-	LOGP(INFO, "Usage: search p_image_colorpath | Search image in db\n");
-	LOGP(INFO, "Usage: add p_image_colorpath | Add image in db, return idx in db, if idx < 0 means failed\n");
-	LOGP(INFO, "Usage: del idx | Delete image in db\n");
-	LOGP(INFO, "Usage: save db_file | Save current db in db_file\n");
-	LOGP(INFO, "Usage: load db_file | Load db in db_file\n");
-	LOGP(INFO, "Usage: gen p_image_colorlist db_file | Gen images in p_image_colorlist and save in db_file\n");
-	LOGP(INFO, "Usage: exit | Exit the program\n");
+	LOGP(DEBUG, "Usage: help | Get cmd list\n");
+	LOGP(DEBUG, "Usage: search p_image_colorpath | Search image in db\n");
+	LOGP(DEBUG, "Usage: add p_image_colorpath | Add image in db, return idx in db, if idx < 0 means failed\n");
+	LOGP(DEBUG, "Usage: del idx | Delete image in db\n");
+	LOGP(DEBUG, "Usage: save db_file | Save current db in db_file\n");
+	LOGP(DEBUG, "Usage: load db_file | Load db in db_file\n");
+	LOGP(DEBUG, "Usage: gen p_image_colorlist db_file | Gen images in p_image_colorlist and save in db_file\n");
+	LOGP(DEBUG, "Usage: exit | Exit the program\n");
 }
 
 int stface_main(stface_handles& handles, int argc, char *argv[]) {
 	cv_result_t cv_result = cv_face_create_detector(&handles.handle_detect, nullptr, CV_DETECT_ENABLE_ALIGN_21);
 	if (cv_result != CV_OK){
-		LOGP(INFO, "create detect handle failed, error code %d\n", cv_result);
+		LOGP(DEBUG, "create detect handle failed, error code %d\n", cv_result);
 	}
 	cv_result = cv_verify_create_handle(&handles.handle_verify, "../../../models/verify.model");
 	if (cv_result != CV_OK){
-		LOGP(INFO, "create verify handle failed, error code %d\n", cv_result);
+		LOGP(DEBUG, "create verify handle failed, error code %d\n", cv_result);
 	}
 	cv_result = cv_verify_create_db(&handles.handle_db);
 	if (cv_result != CV_OK){
-		LOGP(INFO, "create db handle failed, error code %d\n", cv_result);
+		LOGP(DEBUG, "create db handle failed, error code %d\n", cv_result);
 	}
 	
 	if (handles.handle_detect != nullptr && handles.handle_verify != nullptr && handles.handle_db != nullptr) {
 		// stface_db_gen("list.txt","out.db");
-		LOGP(INFO, "Database is empty at the beginning\n");
-		LOGP(INFO, "Please input 'help' to get the cmd list\n");
+		LOGP(DEBUG, "Database is empty at the beginning\n");
+		LOGP(DEBUG, "Please input 'help' to get the cmd list\n");
 		char input_code[256];
 		char image_path[_MAX_PATH];
 		char db_path[_MAX_PATH];
 		char command[256];
 		input_code[0] = 0;
 		while (1) {
-			LOGP(INFO, ">>");
+			LOGP(DEBUG, ">>");
 			if (!fgets(input_code, 256, stdin)) {
-				LOGP(INFO, "read nothing\n");
+				LOGP(DEBUG, "read nothing\n");
 				continue;
 			}
 			int input_length = strlen(input_code);
@@ -302,7 +309,7 @@
 			else if (strcmp(str_input_code.substr(0, 3).c_str(), "add") == 0) {
 				int input_number = sscanf(input_code, "%s%s", command, image_path);
 				if (input_number != 2) {
-					LOGP(INFO, "invalid! Usage: add p_image_colorpath\n");
+					LOGP(DEBUG, "invalid! Usage: add p_image_colorpath\n");
 					continue;
 				}
 				int idx = stface_db_add(handles, image_path);
@@ -312,7 +319,7 @@
 				int idx = -1;
 				int input_number = sscanf(input_code, "%s%d", image_path, &idx);
 				if (input_number != 2) {
-					LOGP(INFO, "invalid! Usage: del idx(unsigned int\n");
+					LOGP(DEBUG, "invalid! Usage: del idx(unsigned int\n");
 					continue;
 				}
 				stface_db_del(handles, idx);
@@ -320,7 +327,7 @@
 			else if (strcmp(str_input_code.substr(0, 4).c_str(), "save") == 0) {
 				int input_number = sscanf(input_code, "%s%s", command, image_path);
 				if (input_number != 2) {
-					LOGP(INFO, "invalid! Usage: save db_file\n");
+					LOGP(DEBUG, "invalid! Usage: save db_file\n");
 					continue;
 				}
 				stface_db_save(handles, image_path);
@@ -328,7 +335,7 @@
 			else if (strcmp(str_input_code.substr(0, 4).c_str(), "load") == 0) {
 				int input_number = sscanf(input_code, "%s%s", command, image_path);
 				if (input_number != 2) {
-					LOGP(INFO, "invalid! Usage: load db_file\n");
+					LOGP(DEBUG, "invalid! Usage: load db_file\n");
 					continue;
 				}
 				stface_db_load(handles, image_path);
@@ -339,7 +346,7 @@
 			else if (strcmp(str_input_code.substr(0, 3).c_str(), "gen") == 0) {
 				int input_number = sscanf(input_code, "%s%s%s", command, image_path, db_path);
 				if (input_number != 3) {
-					LOGP(INFO, "invalid! Usage: gen p_image_colorlist_file db_file\n");
+					LOGP(DEBUG, "invalid! Usage: gen p_image_colorlist_file db_file\n");
 					continue;
 				}
 				stface_db_gen(handles, image_path, db_path);
@@ -347,7 +354,7 @@
 			else if (strcmp(str_input_code.substr(0, 6).c_str(), "search") == 0) {
 				int input_number = sscanf(input_code, "%s%s", command, image_path);
 				if (input_number != 2) {
-					LOGP(INFO, "invalid! Usage: search p_image_colorpath\n");
+					LOGP(DEBUG, "invalid! Usage: search p_image_colorpath\n");
 					continue;
 				}
 				stface_search_db(handles, image_path);
@@ -357,13 +364,13 @@
 				int input_number = sscanf(input_code, "%s%s%s", command, search_path,
 					image_path);
 				if (input_number != 3) {
-					LOGP(INFO, "invalid! Usage: listsearch p_image_colorsrcpath p_image_colorlistpath\n");
+					LOGP(DEBUG, "invalid! Usage: listsearch p_image_colorsrcpath p_image_colorlistpath\n");
 					continue;
 				}
 				stface_search_list(handles, search_path, image_path);
 			}
 			else {
-				LOGP(INFO, "invalid cmd, please input 'help' to get the cmd list\n");
+				LOGP(DEBUG, "invalid cmd, please input 'help' to get the cmd list\n");
 			}
 		}
 	}

--
Gitblit v1.8.0