From 469c7cf3b121d86cb7798c8a51b045170b90e17f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 24 五月 2019 10:30:08 +0800
Subject: [PATCH] add face pos struct

---
 protomsg.proto |  101 ++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/protomsg.proto b/protomsg.proto
index 3edec29..decc42e 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -7,6 +7,7 @@
 	int32 index = 3 ;
 }
 
+//SdkMessage struct test
 message SdkMessage {
 	string cid = 1;
 	TaskLabel tasklab = 2;
@@ -45,6 +46,12 @@
     string reserved = 14;
 }
 
+//鎽勫儚鏈虹殑浠诲姟淇℃伅
+message CameraAndTaskInfo {
+    Camera camera = 1;//鎽勫儚鏈轰俊鎭�
+    repeated Task tasks = 2;//浠诲姟鍒楄〃
+}
+
 //Task缁撴瀯浣�
 message Task {
     string taskid = 1;
@@ -55,6 +62,11 @@
     bool enable = 6;
     bool is_alarm = 7;
     bool del_flag = 8;
+}
+
+message TaskSdkInfo {
+    Task task = 1;
+    repeated Sdk sdks = 2;
 }
 
 //鎽勫儚鏈轰换鍔�
@@ -92,12 +104,6 @@
     repeated Point points = 4;//鐐圭殑闆嗗悎
 }
 
-//Point struct
-message Point {
-    string x = 1;
-    string y = 2;
-}
-
 message CameraTaskArgs {
     string id =1;
     string camera_task_id =2;
@@ -117,15 +123,16 @@
 //Sdk struct
 message Sdk {
     string id = 1;
-    string create_time = 2;
-    string update_time = 3;
-    string create_by = 4;
-    string del_flag = 5;//鏄惁鍒犻櫎
-    string enabled = 6;//鏄惁鍚敤
-    string sdk_name = 7;//sdk鍚嶇О
-    string icon = 8;//绠楁硶鍥炬爣
-    string url = 9;//绠楁硶涓嬭浇鍦板潃
-    repeated SdkArg args = 10;
+    string sdk_type = 2;//绠楁硶绫诲瀷
+    string sdk_name = 3;//sdk鍚嶇О
+    repeated SdkArg args = 4;//绠楁硶鍙傛暟
+    string icon = 5;//绠楁硶鍥炬爣
+    string url = 6;//绠楁硶涓嬭浇鍦板潃
+    string create_time = 7;
+    string update_time = 8;
+    string create_by = 9;
+    string enabled = 10;//鏄惁鍚敤
+    string del_flag = 11;//鏄惁鍒犻櫎
 }
 
 //SdkArg struct
@@ -136,4 +143,66 @@
     bool must = 5;//鍙傛暟鏄惁蹇呭~
     string range = 6;//鍙傛暟鐨勮寖鍥�
     int32 sort = 7;//鍙傛暟鎺掑簭
-}
\ No newline at end of file
+}
+
+// struct for sdk
+message Point{
+	int32 x = 1;
+	int32 y = 2;
+}
+message Rect{
+	int32 left = 1;
+	int32 top = 2;
+	int32 right = 3;
+	int32 bottom = 4;
+}
+message FaceAngle{
+	int32 yaw = 1;
+	int32 pitch =2;
+	int32 roll = 3;
+	float confidence =4;
+}
+message ThftResult{
+	int32 gender = 1;
+	int32 age = 2;
+	int32 race = 3;
+	int32 beauty = 4;
+	int32 smile = 5;
+}
+message FacePos{
+	Rect rcFace = 1;
+	Point ptLeftEye = 2;
+	Point ptRightEye = 3;
+	Point ptMouth = 4;
+	Point ptNose = 5;
+	FaceAngle fAngle = 6;
+	int32 quality = 7;
+	bytes facialData = 8;
+}
+message FaceInfo{
+	Rect rcFace = 1;
+	Point ptLeftEye = 2;
+	Point ptRightEye = 3;
+	Point ptMouth = 4;
+	Point ptNose = 5;
+	FaceAngle fAngle = 6;
+	int32 quality = 7;
+	bytes facialData = 8;
+	int64 faceID = 9;
+}
+message ObjInfo{
+	Rect rcObj = 1;
+	int32 typ = 2;
+	float prob = 3;
+}
+
+// sdk face property
+message ParamFacePos{
+	repeated FacePos pos = 1;
+	Image img = 2;
+}
+// sdk face extract
+message ParamFaceCompare{
+	bytes feat1 = 1;
+	bytes feat2 = 2;
+}

--
Gitblit v1.8.0