From 52bd84663ef5bff417588dccd324937d506b9d95 Mon Sep 17 00:00:00 2001 From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 27 四月 2017 18:38:13 +0800 Subject: [PATCH] optimize --- FaceServer/main_face_daemon.cpp | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/FaceServer/main_face_daemon.cpp b/FaceServer/main_face_daemon.cpp index 6cfc437..e4783ab 100644 --- a/FaceServer/main_face_daemon.cpp +++ b/FaceServer/main_face_daemon.cpp @@ -6,7 +6,7 @@ #include "face_daemon_proto.h" #include "sample_face_search.h" #include "STFaceCache.h" -#include <PbFaceList.pb.h> +#include "PbFaceList.pb.h" #include <signal.h> @@ -42,8 +42,8 @@ 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; @@ -61,6 +61,7 @@ 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)); @@ -120,13 +121,13 @@ 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; + //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); -- Gitblit v1.8.0