From c34f11fb7407594f7c1eb69b11f84a45d13cfa1a Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 四月 2017 11:55:11 +0800
Subject: [PATCH]
---
FaceServer/main_face_daemon.cpp | 91 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 80 insertions(+), 11 deletions(-)
diff --git a/FaceServer/main_face_daemon.cpp b/FaceServer/main_face_daemon.cpp
index 21da9f3..86fee13 100644
--- a/FaceServer/main_face_daemon.cpp
+++ b/FaceServer/main_face_daemon.cpp
@@ -4,6 +4,7 @@
#include "ev_server.h"
#include "ev_proto.h"
#include "face_daemon_proto.h"
+#include "sample_face_search.h"
#include "STFaceCache.h"
#include <PbFaceList.pb.h>
@@ -24,12 +25,12 @@
server_stop();
}
-bool send_SensetimeFaceDetectResultJson(EVClientStub& client, const fdr_vec_t& result)
+bool send_SensetimeFaceDetectResultJson(EVClientStub& client, const fdr_vec_t& result, int ret = 0)
{
std::stringstream ss;
- ss << "{" << std::endl;
- ss << "\"ret\":" << WRAPPER_TEXT(0) << "," << std::endl;
- ss << "\"count\":" << WRAPPER_TEXT(result.size()) << "," << std::endl;
+ ss << "{" << LOG_ENDL;
+ ss << "\"ret\":" << WRAPPER_TEXT(ret) << "," << LOG_ENDL;
+ ss << "\"count\":" << WRAPPER_TEXT(result.size()) << "," << LOG_ENDL;
ss << "\"result\":[";
for(fdr_vec_t::const_iterator iter = result.begin(); iter != result.end(); ++iter)
{
@@ -37,7 +38,7 @@
if (iter != std::prev(result.end()))
ss << ",";
}
- ss << "]" << std::endl;
+ ss << "]" << LOG_ENDL;
ss << "}";
std::string output(ss.str());//#todo avoid copy
@@ -55,7 +56,7 @@
{
//#test send //00038300FE4B0000+pb
//EVPHeader* evpHeader = (EVPHeader*)client.recvBuff;
- //LOG_DEBUG << "cmd=" << evpHeader->cmd << ", size=" << evpHeader->size << ", \t" << (char*)(evpHeader + sizeof(EVPHeader)) << std::endl;
+ //LOG_DEBUG << "cmd=" << evpHeader->cmd << ", size=" << evpHeader->size << ", \t" << (char*)(evpHeader + sizeof(EVPHeader)) << LOG_ENDL;
//return true;
EVPHeader* evpHeader = (EVPHeader*)client.recvBuff;
@@ -102,6 +103,27 @@
return send_SensetimeFaceDetectResultJson(client, result);
}
+bool ev_proc_SensetimeFaceDetectSave(EVClientStub& client)
+{
+ EVPHeader* evpHeader = (EVPHeader*)client.recvBuff;
+ FDP_Image* fdpImage = (FDP_Image*)(client.recvBuff + sizeof(EVPHeader));
+
+ 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;
+
+ fdr_vec_t result;
+ FDP_FaceDetectResult fdrResult = g_STFaceCache.add(stfaceImg);
+ result.push_back(fdrResult);
+
+ int ret = (fdrResult.db_id == 0 ? -1 : 0);
+ return send_SensetimeFaceDetectResultJson(client, result, ret);
+}
+
bool ev_dispatcher_proto_pb(EVClientStub& client)
{
LOG_DEBUG << "ev_dispatcher_proto_pb" << LOG_ENDL;
@@ -109,7 +131,7 @@
EVPHeader* evpHeader = (EVPHeader*)client.recvBuff;
if (evpHeader->size != client.recvBuffSize)
{
- LOG_WARN << "Truncated buffer " << (evpHeader->size - client.recvBuffSize) << " bytes" << std::endl;
+ LOG_WARN << "Truncated buffer " << (evpHeader->size - client.recvBuffSize) << " bytes" << LOG_ENDL;
return false;
}
@@ -120,7 +142,34 @@
return ev_proc_SensetimeFaceDetectPB(client);
break;
default:
- LOG_WARN << "Unknown command" << std::endl;
+ LOG_WARN << "Unknown command" << LOG_ENDL;
+ ev_send_status_packet(client, EVPStatus::EVPS_COMMAND_ERROR);
+ return false;
+ break;
+ }
+
+ // return false to disconnect
+ return false;
+}
+
+bool ev_dispatcher_proto_rawbin(EVClientStub& client)
+{
+ LOG_DEBUG << "ev_dispatcher_proto_pb" << LOG_ENDL;
+
+ EVPHeader* evpHeader = (EVPHeader*)client.recvBuff;
+ if (evpHeader->size != client.recvBuffSize)
+ {
+ LOG_WARN << "Truncated buffer " << (evpHeader->size - client.recvBuffSize) << " bytes" << LOG_ENDL;
+ return false;
+ }
+
+ switch(evpHeader->cmd)
+ {
+ case FaceDaemonCommand::FDC_SENSETIMEFACEDETECT_SAVE:
+ return ev_proc_SensetimeFaceDetectSave(client);
+ break;
+ default:
+ LOG_WARN << "Unknown command" << LOG_ENDL;
ev_send_status_packet(client, EVPStatus::EVPS_COMMAND_ERROR);
return false;
break;
@@ -137,7 +186,7 @@
EVPHeader* evpHeader = (EVPHeader*)client.recvBuff;
if (evpHeader->size != client.recvBuffSize)
{
- LOG_WARN << "Truncated buffer " << (evpHeader->size - client.recvBuffSize) << " bytes" << std::endl;
+ LOG_WARN << "Truncated buffer " << (evpHeader->size - client.recvBuffSize) << " bytes" << LOG_ENDL;
return false;
}
@@ -146,8 +195,11 @@
case EVPProto::EVPP_PROTOBUF:
return ev_dispatcher_proto_pb(client);
break;
+ case EVPProto::EVPP_RAW_BIN:
+ return ev_dispatcher_proto_rawbin(client);
+ break;
default:
- LOG_WARN << "Unknown proto" << std::endl;
+ LOG_WARN << "Unknown proto" << LOG_ENDL;
ev_send_status_packet(client, EVPStatus::EVPS_PROTO_ERROR);
return false;
break;
@@ -163,6 +215,23 @@
signal(SIGINT, _sigint);
+ if (!g_STFaceCache.init())
+ {
+ LOG_WARN << "g_STFaceCache.init return false" << LOG_ENDL;
+ return EXIT_FAILURE;
+ }
+
+ if (!g_STFaceCache.load_dbs())
+ {
+ LOG_WARN << "g_STFaceCache.load_dbs return false" << LOG_ENDL;
+ return EXIT_FAILURE;
+ }
+
evclient_proc = ev_dispatcher_proto;
- return server_main(argc, argv);
+ int ec = server_main(argc, argv);
+
+ g_STFaceCache.close_dbs();
+ g_STFaceCache.finit();
+
+ return ec;
}
--
Gitblit v1.8.0