From 0a7e6639ae4e193de0e15c86fde488c950f315d0 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 20:53:24 +0800
Subject: [PATCH] Failed commit: Default
---
FaceServer/face_daemon_proto.h | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/FaceServer/face_daemon_proto.h b/FaceServer/face_daemon_proto.h
index 4bc6e34..cf642a9 100644
--- a/FaceServer/face_daemon_proto.h
+++ b/FaceServer/face_daemon_proto.h
@@ -19,6 +19,8 @@
FDC_SENSETIMEFACEDETECT_PB,
FDC_SENSETIMEFACEDETECT_RESULT_JSON,
FDC_SENSETIMEFACEDETECT_SAVE,
+ FDC_SENSETIMEFACEDETECT_COMPARE,
+ FDC_SENSETIMEFACEDETECT_SEARCH,
FDC__LAST,
};
};
@@ -29,6 +31,7 @@
int16_t mb_type; // MB_Frame::MBFType
int16_t width;
int16_t height;
+ int16_t size;
uint8_t buff[0];
void hton();
@@ -39,8 +42,9 @@
struct FDP_FaceDetectPB
{
int32_t db_id;
+ int16_t camera_id;
- FDP_FaceDetectPB(int32_t _db_id) : db_id(_db_id)
+ FDP_FaceDetectPB(int32_t _db_id, int16_t _camera_id) : db_id(_db_id), camera_id(_camera_id)
{}
void hton();
@@ -51,8 +55,13 @@
{
int32_t db_id;
int32_t st_id; // sensetime id
+ int16_t confidence; // 1000 times of float confidence, less than zero means error
- FDP_FaceDetectResult(int32_t _db_id, int32_t _st_id) : db_id(_db_id), st_id(_st_id)
+ int16_t camera_id;
+ int32_t st_track_id;
+
+ FDP_FaceDetectResult(int32_t _db_id, int32_t _st_id, int _confidence) :
+ db_id(_db_id), st_id(_st_id), confidence(_confidence), camera_id(0), st_track_id(0)
{}
void hton();
--
Gitblit v1.8.0