From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH]
---
FaceServer/main_face_daemon.cpp | 159 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 127 insertions(+), 32 deletions(-)
diff --git a/FaceServer/main_face_daemon.cpp b/FaceServer/main_face_daemon.cpp
index 09f30e3..e4783ab 100644
--- a/FaceServer/main_face_daemon.cpp
+++ b/FaceServer/main_face_daemon.cpp
@@ -4,15 +4,19 @@
#include "ev_server.h"
#include "ev_proto.h"
#include "face_daemon_proto.h"
-
-#include <PbFaceList.pb.h>
+#include "sample_face_search.h"
+#include "STFaceCache.h"
+#include "PbFaceList.pb.h"
#include <signal.h>
#include <sstream>
#include <iostream>
+#define WRAPPER_TEXT(x) "\"" << x << "\""
+
Logger g_logger(std::cout);
+STFaceCache g_STFaceCache("/opt/FaceServer/stfacedb");
evclient_proc_t evclient_proc;
@@ -21,25 +25,25 @@
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\":" << 0 << "," << std::endl;
- ss << "\"count\":" << 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)
{
- ss << "[" << iter->db_id << "," << iter->st_id << "]";
+ ss << "[" << WRAPPER_TEXT(iter->db_id) << "," << WRAPPER_TEXT(iter->st_id) << "]";
if (iter != std::prev(result.end()))
ss << ",";
}
- ss << "]" << std::endl;
+ ss << "]" << LOG_ENDL;
ss << "}";
std::string output(ss.str());//#todo avoid copy
- client.sendBuffSize = output.size() + 1;
- client.sendBuff = new uint8_t[client.sendBuffSize];
+ client.sendBuffSize = output.size();
+ client.sendBuff = new uint8_t[output.size() + 1];
strcpy((char*)client.sendBuff, output.c_str());
client.deleteSendBuff = true;
@@ -52,41 +56,85 @@
{
//#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;
FDP_FaceDetectPB* fdpFaceDetectPB = (FDP_FaceDetectPB*)(client.recvBuff + sizeof(EVPHeader));
+ fdpFaceDetectPB->ntoh();
PbFaceList pbFaceList;
pbFaceList.ParseFromArray(client.recvBuff + sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB), evpHeader->size - sizeof(EVPHeader) - sizeof(FDP_FaceDetectPB));
LOGP(DEBUG, "pbFaceList: magic=%u, image_count=%u, src_width=%u, src_height=%u",
pbFaceList.magic(), pbFaceList.image_count(), pbFaceList.src_width(), pbFaceList.src_height());
+ fdr_vec_t result;
+
for(int i = 0; i < pbFaceList.image_count(); i++)
{
const PbFaceList_FaceListImage& pbFaceListImage = pbFaceList.images(i);
LOGP(DEBUG, "\tpbFaceList %d: idx=%u, size=%u, type=%u, width=%u, height=%u, top_left_x=%u, top_left_y=%u",
i, pbFaceListImage.idx(), pbFaceListImage.size(), pbFaceListImage.type(), pbFaceListImage.width(), pbFaceListImage.height(), pbFaceListImage.top_left_x(), pbFaceListImage.top_left_y());
-
- char imgfn[100 * 1024];
- sprintf(imgfn, "PB_%d_%d.yuv", 0, i);
-
- FILE * pFile = fopen(imgfn, "wb");
- fwrite(*(pbFaceListImage.img().data()), sizeof(char), pbFaceListImage.size(), pFile);
- fclose(pFile);
- pFile = nullptr;
+
+ //#test
+ //char imgfn[100 * 1024];
+ //sprintf(imgfn, "PB_%d_%d.yuv", 0, i);
+ //
+ //FILE * pFile = fopen(imgfn, "wb");
+ const std::string* img(*pbFaceListImage.img().data());
+ //fwrite(img->data(), sizeof(char), img->size(), pFile);
+ //fclose(pFile);
+ //pFile = nullptr;
+
+ STFaceImage stimg;
+ stimg.db_id = fdpFaceDetectPB->db_id;
+ stimg.mb_type = pbFaceListImage.type();
+ stimg.width = pbFaceListImage.width();
+ stimg.height = pbFaceListImage.height();
+ stimg.size = img->size();
+ stimg.buff = (const uint8_t*)img->data();
+ result.push_back(g_STFaceCache.detect(stimg));
}
-
-
- fdr_vec_t result;
-
- //do detect(client)
- result.push_back(FDP_FaceDetectResult(-1,123));
- result.push_back(FDP_FaceDetectResult(2,456));
- result.push_back(FDP_FaceDetectResult(0,0));
+
+ //#test
+ //result.push_back(FDP_FaceDetectResult(-1,123));
+ //result.push_back(FDP_FaceDetectResult(2,456));
+ //result.push_back(FDP_FaceDetectResult(0,0));
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));
+ 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;
+ 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)
@@ -96,7 +144,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;
}
@@ -107,7 +155,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_rawbin" << 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;
@@ -124,7 +199,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;
}
@@ -133,8 +208,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;
@@ -150,6 +228,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