From d9125b1f5e3bfd1c657d75c4ef812f1202dc406d Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 10 七月 2017 10:12:44 +0800
Subject: [PATCH] proto support st_track_id
---
FaceServer/main_face_daemon.cpp | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/FaceServer/main_face_daemon.cpp b/FaceServer/main_face_daemon.cpp
index bd12356..baff933 100644
--- a/FaceServer/main_face_daemon.cpp
+++ b/FaceServer/main_face_daemon.cpp
@@ -34,7 +34,11 @@
ss << "\"result\":[";
for(fdr_vec_t::const_iterator iter = result.begin(); iter != result.end(); ++iter)
{
- ss << "[" << WRAPPER_TEXT(iter->db_id) << "," << WRAPPER_TEXT(iter->st_id) << "," << WRAPPER_TEXT(iter->confidence) << "]";
+ ss << "[" << WRAPPER_TEXT(iter->db_id) << ","
+ << WRAPPER_TEXT(iter->st_id) << ","
+ << WRAPPER_TEXT(iter->confidence) << ","
+ << WRAPPER_TEXT(iter->camera_id) << ","
+ << WRAPPER_TEXT(iter->st_track_id) << "]";
if (iter != std::prev(result.end()))
ss << ",";
}
@@ -93,7 +97,21 @@
stimg.height = pbFaceListImage.height();
stimg.size = img->size();
stimg.buff = (const uint8_t*)img->data();
- result.push_back(g_STFaceCache.detect(stimg));
+
+ FDP_FaceDetectResult res(g_STFaceCache.detect(stimg));
+
+#ifdef ENABLE_ADD_TO_TEMPDB_WHEN_NOT_DETECT
+ if (res.db_id == STFS_DBID_INVALID)
+ {
+ // #todo optimize extract feature once
+ stimg.db_id = STFS_DBID_TEMPDB_1;
+ res = g_STFaceCache.add(stimg);
+ }
+#endif
+
+ res.camera_id = fdpFaceDetectPB->camera_id;
+ res.st_track_id = pbFaceListImage.st_track_id();
+ result.push_back(res);
}
//#test
--
Gitblit v1.8.0