From 6ec2cc5ab6bb2ef338461604636f5bd7dbb6ebbc Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 11 一月 2017 18:27:15 +0800
Subject: [PATCH] face daemon develop finish
---
RtspFace/main_face_daemon.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/RtspFace/main_face_daemon.cpp b/RtspFace/main_face_daemon.cpp
index ad8df4d..b614719 100644
--- a/RtspFace/main_face_daemon.cpp
+++ b/RtspFace/main_face_daemon.cpp
@@ -57,7 +57,7 @@
PipeLinePool g_PipeLinePool;
-FaceDBPool g_FaceDBPool;//#todo config
+FaceDBPool g_faceAPIPool;//#todo config
evclient_proc_t evclient_proc;
@@ -102,15 +102,15 @@
FDP_Image* fdpImage = (FDP_Image*)(client.recvBuff + sizeof(EVPHeader));
- faceAPI* _faceDB = g_FaceDBPool.get_free(fdpImage->school_id);
- if (_faceDB == nullptr)
+ faceAPI* _faceAPI = g_faceAPIPool.get_free(fdpImage->school_id);
+ if (_faceAPI == nullptr)
{
LOG_WARN << "can't get face db";
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)
@@ -132,7 +132,7 @@
dbFrame.width = fdpImage->width;
dbFrame.height = fdpImage->height;
dbFrame.school_id = fdpImage->school_id;
- dbFrame._faceDB = _faceDB;
+ dbFrame._faceAPI = _faceAPI;
PipeMaterial pm;
pm.type = PipeMaterial::PMT_FRAME;
--
Gitblit v1.8.0