From 65a094bd57829118503802220b7125053c643c41 Mon Sep 17 00:00:00 2001
From: qvyuanxin <qvyuanxin@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 04 七月 2017 18:58:25 +0800
Subject: [PATCH]
---
FaceServer/main_face_daemon.cpp | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/FaceServer/main_face_daemon.cpp b/FaceServer/main_face_daemon.cpp
index ec706f7..bd12356 100644
--- a/FaceServer/main_face_daemon.cpp
+++ b/FaceServer/main_face_daemon.cpp
@@ -183,12 +183,44 @@
//fclose(pFile);
//pFile = nullptr;
- //fdr_vec_t result;
- //FDP_FaceDetectResult fdrResult = g_STFaceCache.add(stfaceImg);
- //result.push_back(fdrResult);
- //
+ 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, ret);
+ return send_SensetimeFaceDetectResultJson(client, result, 0);
}
bool ev_dispatcher_proto_pb(EVClientStub& client)
@@ -238,6 +270,9 @@
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