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]
---
RtspFace/main_face_daemon.cpp | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/RtspFace/main_face_daemon.cpp b/RtspFace/main_face_daemon.cpp
index ad8df4d..9058ee4 100644
--- a/RtspFace/main_face_daemon.cpp
+++ b/RtspFace/main_face_daemon.cpp
@@ -22,6 +22,7 @@
#include "face_daemon_proto.h"
#include "SensetimeFaceAPIWrapper/src/FaceDBPool.h"
+#include "SensetimeFaceAPIWrapper/src/faceAPI.h"
#include "logger.h"
@@ -57,7 +58,7 @@
PipeLinePool g_PipeLinePool;
-FaceDBPool g_FaceDBPool;//#todo config
+FaceDBPool g_faceAPIPool;//#todo config
evclient_proc_t evclient_proc;
@@ -67,12 +68,12 @@
//PipeMaterial& facePM = ((PipeMaterial*)(lastPm.buffer))[1];
//st_ff_vect_t& faceFeatures = *((st_ff_vect_t*)facePM.buffer);
- //LOG_NOTICE << "faceFeatures " << faceFeatures.size();
+ //LOG_NOTICE << "faceFeatures " << faceFeatures.size() << std::endl;
//#todo send result packet
if (lastPm.buffer == nullptr || lastPm.type != PipeMaterial::PMT_BYTES || lastPm.buffSize != sizeof(SensetimeFaceDetectResult))
{
- LOG_WARN << "pm not available";
+ LOG_WARN << "pm not available" << std::endl;
ev_send_status_packet(client, EVPStatus::EVPS_INTERNAL_ERROR);
return false;
}
@@ -97,25 +98,25 @@
bool ev_proc_SensetimeFaceDetect(EVClientStub& client)
{
//#test send 01000B0000004142434445
- //LOG_DEBUG << "cmd=" << evpHeader->cmd << ", size=" << evpHeader->size << ", \t" << (char*)(evpHeader + sizeof(EVPHeader));
+ //LOG_DEBUG << "cmd=" << evpHeader->cmd << ", size=" << evpHeader->size << ", \t" << (char*)(evpHeader + sizeof(EVPHeader)) << std::endl;
//return true;
FDP_Image* fdpImage = (FDP_Image*)(client.recvBuff + sizeof(EVPHeader));
- faceAPI* _faceDB = g_FaceDBPool.get_free(fdpImage->school_id);
+ FaceDB* _faceDB = g_faceAPIPool.get_free(fdpImage->school_id);
if (_faceDB == nullptr)
{
- LOG_WARN << "can't get face db";
+ LOG_WARN << "can't get face db" << std::endl;
ev_send_status_packet(client, EVPStatus::EVPS_PARAMETER_ERROR);
return false;
}
- PoolElemLocker<FaceDBPool*, int> _lock_faceDB(&g_FaceDBPool, fdpImage->school_id);
+ PoolElemLocker<FaceDBPool*, int> _lock_faceAPI(&g_faceAPIPool, fdpImage->school_id);
PipeLine* pipeLine = g_PipeLinePool.get_free();
if (pipeLine == nullptr)
{
- LOG_WARN << "can't get free pipeline";
+ LOG_WARN << "can't get free pipeline" << std::endl;
ev_send_status_packet(client, EVPStatus::EVPS_INTERNAL_ERROR);
return false;
}
@@ -142,14 +143,14 @@
PipeLineElem* plElem = pipeLine->pipe(&pm);
if (! pipeLine->check_pipe_complete(plElem))
{
- LOG_WARN << "pipeline not complete";
+ LOG_WARN << "pipeline not complete" << std::endl;
ev_send_status_packet(client, EVPStatus::EVPS_INTERNAL_ERROR);
return false;
}
if (!plElem->gain(pm))
{
- LOG_WARN << "pipeline gain error";
+ LOG_WARN << "pipeline gain error" << std::endl;
ev_send_status_packet(client, EVPStatus::EVPS_INTERNAL_ERROR);
return false;
}
@@ -165,7 +166,7 @@
EVPHeader* evpHeader = (EVPHeader*)client.recvBuff;
if (evpHeader->size != client.recvBuffSize)
{
- LOG_WARN << "Truncated buffer " << (evpHeader->size - client.recvBuffSize) << " bytes";
+ LOG_WARN << "Truncated buffer " << (evpHeader->size - client.recvBuffSize) << " bytes" << std::endl;
return false;
}
@@ -175,7 +176,7 @@
return ev_proc_SensetimeFaceDetect(client);
break;
default:
- LOG_WARN << "Unknown command";
+ LOG_WARN << "Unknown command" << std::endl;
ev_send_status_packet(client, EVPStatus::EVPS_PARAMETER_ERROR);
return false;
break;
@@ -205,7 +206,7 @@
bool ret = ple->init(&config);
if (!ret)
{
- LOG_ERROR << "ple init error";
+ LOG_ERROR << "ple init error" << std::endl;
exit(EXIT_FAILURE);
}
}
@@ -219,7 +220,7 @@
bool ret = ple->init(&config);
if (!ret)
{
- LOG_ERROR << "ple init error";
+ LOG_ERROR << "ple init error" << std::endl;
exit(EXIT_FAILURE);
}
}
--
Gitblit v1.8.0