From 9ee90782bf14b91442cd524bc033bbf6d1778bb2 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 29 六月 2017 10:32:05 +0800
Subject: [PATCH] aaaaa

---
 FaceServer/main_face_daemon.cpp |   94 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 93 insertions(+), 1 deletions(-)

diff --git a/FaceServer/main_face_daemon.cpp b/FaceServer/main_face_daemon.cpp
index e4783ab..bd12356 100644
--- a/FaceServer/main_face_daemon.cpp
+++ b/FaceServer/main_face_daemon.cpp
@@ -34,7 +34,7 @@
 	ss << "\"result\":[";
 	for(fdr_vec_t::const_iterator iter = result.begin(); iter != result.end(); ++iter)
 	{
-		ss << "[" << WRAPPER_TEXT(iter->db_id) << "," << WRAPPER_TEXT(iter->st_id) << "]";
+		ss << "[" << WRAPPER_TEXT(iter->db_id) << "," << WRAPPER_TEXT(iter->st_id) <<  "," << WRAPPER_TEXT(iter->confidence) << "]";
 		if (iter != std::prev(result.end()))
 			ss << ",";
 	}
@@ -137,6 +137,92 @@
 	return send_SensetimeFaceDetectResultJson(client, result, ret);
 }
 
+bool ev_proc_SensetimeFaceDetectCompare(EVClientStub& client)
+{
+	EVPHeader* evpHeader = (EVPHeader*)client.recvBuff;
+	
+	FDP_Image* fdpImage1 = (FDP_Image*)(client.recvBuff + sizeof(EVPHeader));
+	fdpImage1->ntoh();
+	
+	STFaceImage stfaceImg1;
+	stfaceImg1.db_id = fdpImage1->db_id;
+	stfaceImg1.mb_type = fdpImage1->mb_type;
+	stfaceImg1.width = fdpImage1->width;
+	stfaceImg1.height = fdpImage1->height;
+	stfaceImg1.size = fdpImage1->size;
+	stfaceImg1.buff = fdpImage1->buff;
+	
+	LOGP(DEBUG, "stfaceImg1 db_id=%d, mb_type=%d, width=%d, height=%d, size=%d", 
+		(int)stfaceImg1.db_id, (int)stfaceImg1.mb_type, (int)stfaceImg1.width, (int)stfaceImg1.height, (int)stfaceImg1.size);
+	
+	FDP_Image* fdpImage2 = (FDP_Image*)(client.recvBuff + sizeof(EVPHeader) + sizeof(FDP_Image) + fdpImage1->size);
+	fdpImage2->ntoh();
+	
+	STFaceImage stfaceImg2;
+	stfaceImg2.db_id = fdpImage2->db_id;
+	stfaceImg2.mb_type = fdpImage2->mb_type;
+	stfaceImg2.width = fdpImage2->width;
+	stfaceImg2.height = fdpImage2->height;
+	stfaceImg2.size = fdpImage2->size;
+	stfaceImg2.buff = fdpImage2->buff;
+	
+	LOGP(DEBUG, "stfaceImg2 db_id=%d, mb_type=%d, width=%d, height=%d, size=%d", 
+		(int)stfaceImg2.db_id, (int)stfaceImg2.mb_type, (int)stfaceImg2.width, (int)stfaceImg2.height, (int)stfaceImg2.size);
+
+	//char imgfn[100 * 1024];
+	//static int i = 0;
+	//sprintf(imgfn, "IMG_%d_%d_w%d_h%d.img", stfaceImg1.db_id, ++i, stfaceImg1.width, stfaceImg1.height);
+	//FILE * pFile = fopen(imgfn, "wb");
+	//fwrite(stfaceImg1.buff, sizeof(char), stfaceImg1.size, pFile);
+	//fclose(pFile);
+	//pFile = nullptr;
+    //
+	//sprintf(imgfn, "IMG_%d_%d_w%d_h%d.img", stfaceImg2.db_id, ++i, stfaceImg2.width, stfaceImg2.height);
+	//pFile = fopen(imgfn, "wb");
+	//fwrite(stfaceImg2.buff, sizeof(char), stfaceImg2.size, pFile);
+	//fclose(pFile);
+	//pFile = nullptr;
+	
+	fdr_vec_t result;
+	FDP_FaceDetectResult fdrResult = g_STFaceCache.compare(stfaceImg1, stfaceImg2);
+	result.push_back(fdrResult);
+
+	return send_SensetimeFaceDetectResultJson(client, result, 0);
+}
+
+bool ev_proc_SensetimeFaceDetectSearch(EVClientStub& client)
+{
+	EVPHeader* evpHeader = (EVPHeader*)client.recvBuff;
+	FDP_Image* fdpImage = (FDP_Image*)(client.recvBuff + sizeof(EVPHeader));
+	fdpImage->ntoh();
+	
+	STFaceImage stfaceImg;
+	stfaceImg.db_id = fdpImage->db_id;
+	stfaceImg.mb_type = fdpImage->mb_type;
+	stfaceImg.width = fdpImage->width;
+	stfaceImg.height = fdpImage->height;
+	stfaceImg.size = evpHeader->size - sizeof(EVPHeader) - sizeof(FDP_Image);
+	stfaceImg.buff = fdpImage->buff;
+	
+	LOGP(DEBUG, "stfaceImg db_id=%d, mb_type=%d, width=%d, height=%d, size=%d", 
+		(int)stfaceImg.db_id, (int)stfaceImg.mb_type, (int)stfaceImg.width, (int)stfaceImg.height, (int)stfaceImg.size);
+	
+	
+	char imgfn[100 * 1024];
+	static int i = 0;
+	sprintf(imgfn, "IMG_%d_%d_w%d_h%d.rgb565", stfaceImg.db_id, ++i, stfaceImg.width, stfaceImg.height);
+	FILE * pFile = fopen(imgfn, "wb");
+	fwrite(stfaceImg.buff, sizeof(char), stfaceImg.size, pFile);
+	fclose(pFile);
+	pFile = nullptr;
+	
+	fdr_vec_t result;
+	g_STFaceCache.search(stfaceImg, result);
+	
+	//int ret = (fdrResult.db_id == 0 ? -1 : 0);
+	return send_SensetimeFaceDetectResultJson(client, result, 0);
+}
+
 bool ev_dispatcher_proto_pb(EVClientStub& client)
 {
 	LOG_DEBUG << "ev_dispatcher_proto_pb" << LOG_ENDL;
@@ -181,6 +267,12 @@
 	case FaceDaemonCommand::FDC_SENSETIMEFACEDETECT_SAVE:
 		return ev_proc_SensetimeFaceDetectSave(client);
 	break;
+	case FaceDaemonCommand::FDC_SENSETIMEFACEDETECT_COMPARE:
+		return ev_proc_SensetimeFaceDetectCompare(client);
+	break;
+	case FaceDaemonCommand::FDC_SENSETIMEFACEDETECT_SEARCH:
+		return ev_proc_SensetimeFaceDetectSearch(client);
+	break;
 	default:
 		LOG_WARN << "Unknown command" << LOG_ENDL;
 		ev_send_status_packet(client, EVPStatus::EVPS_COMMAND_ERROR);

--
Gitblit v1.8.0