From ed0e29aa5f786d43f36d89e8cd8a4a5ca4c7fade Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 25 七月 2019 20:44:44 +0800
Subject: [PATCH] extend CompareArgs
---
sdk.pb.go | 159 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 115 insertions(+), 44 deletions(-)
diff --git a/sdk.pb.go b/sdk.pb.go
index 62365a4..96b9780 100644
--- a/sdk.pb.go
+++ b/sdk.pb.go
@@ -260,6 +260,7 @@
FAngle *FaceAngle `protobuf:"bytes,6,opt,name=fAngle,proto3" json:"fAngle,omitempty"`
Quality int32 `protobuf:"varint,7,opt,name=quality,proto3" json:"quality,omitempty"`
FacialData []byte `protobuf:"bytes,8,opt,name=facialData,proto3" json:"facialData,omitempty"`
+ FaceID uint64 `protobuf:"varint,9,opt,name=faceID,proto3" json:"faceID,omitempty"`
}
func (m *FacePos) Reset() { *m = FacePos{} }
@@ -349,6 +350,13 @@
return m.FacialData
}
return nil
+}
+
+func (m *FacePos) GetFaceID() uint64 {
+ if m != nil {
+ return m.FaceID
+ }
+ return 0
}
type FaceInfo struct {
@@ -463,6 +471,7 @@
RcObj *Rect `protobuf:"bytes,1,opt,name=rcObj,proto3" json:"rcObj,omitempty"`
Typ int32 `protobuf:"varint,2,opt,name=typ,proto3" json:"typ,omitempty"`
Prob float32 `protobuf:"fixed32,3,opt,name=prob,proto3" json:"prob,omitempty"`
+ ObjID uint64 `protobuf:"varint,4,opt,name=objID,proto3" json:"objID,omitempty"`
}
func (m *ObjInfo) Reset() { *m = ObjInfo{} }
@@ -515,6 +524,13 @@
func (m *ObjInfo) GetProb() float32 {
if m != nil {
return m.Prob
+ }
+ return 0
+}
+
+func (m *ObjInfo) GetObjID() uint64 {
+ if m != nil {
+ return m.ObjID
}
return 0
}
@@ -790,50 +806,51 @@
func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) }
var fileDescriptor_70decb0fb6f436df = []byte{
- // 687 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x54, 0x4f, 0x6f, 0xd3, 0x4e,
- 0x10, 0xad, 0x93, 0xda, 0x69, 0x26, 0x55, 0x7f, 0xfd, 0x2d, 0x15, 0xb2, 0x2a, 0x64, 0x45, 0x06,
- 0xd1, 0x20, 0x4a, 0x41, 0x01, 0x89, 0x2b, 0x7f, 0xda, 0x8a, 0x4a, 0x40, 0xa3, 0x15, 0x1c, 0x38,
- 0x6e, 0xec, 0xb5, 0xe3, 0x62, 0x7b, 0x8d, 0xbd, 0x51, 0x1b, 0xf1, 0x09, 0xb8, 0xf1, 0xb1, 0x38,
- 0x70, 0xe8, 0x91, 0x23, 0x6a, 0xc5, 0xf7, 0x40, 0xb3, 0xbb, 0xae, 0x5d, 0xa9, 0xe5, 0xc2, 0x95,
- 0x53, 0x66, 0x76, 0x9e, 0xf7, 0xbd, 0x37, 0xb3, 0x13, 0xe8, 0x57, 0xe1, 0xc7, 0x9d, 0xa2, 0x14,
- 0x52, 0x90, 0x15, 0xf5, 0x93, 0x55, 0xf1, 0x26, 0x4c, 0x59, 0xc5, 0xf5, 0xa9, 0xff, 0xc5, 0x02,
- 0xfb, 0x20, 0x63, 0x31, 0x27, 0x1b, 0x60, 0x1f, 0x27, 0xa1, 0x9c, 0xb9, 0xd6, 0xd0, 0x1a, 0xd9,
- 0x54, 0x27, 0xe4, 0x26, 0x38, 0x33, 0x9e, 0xc4, 0x33, 0xe9, 0x76, 0xd4, 0xb1, 0xc9, 0x08, 0x81,
- 0xe5, 0x90, 0x49, 0xe6, 0x76, 0x87, 0xd6, 0x68, 0x95, 0xaa, 0x98, 0xdc, 0x82, 0xbe, 0x4c, 0x32,
- 0x5e, 0x49, 0x96, 0x15, 0xee, 0xf2, 0xd0, 0x1a, 0xf5, 0x69, 0x73, 0x40, 0xd6, 0xa0, 0x93, 0x84,
- 0xae, 0x3d, 0xb4, 0x46, 0x5d, 0xda, 0x49, 0x42, 0xb2, 0x0e, 0xdd, 0x20, 0x09, 0x5d, 0x47, 0xe1,
- 0x30, 0xf4, 0x63, 0xe8, 0xef, 0xb3, 0x80, 0x3f, 0xcf, 0xe3, 0x94, 0x63, 0x79, 0xc1, 0x8e, 0x8d,
- 0x18, 0x0c, 0x51, 0x60, 0x91, 0xc8, 0x60, 0x66, 0x94, 0xe8, 0x04, 0x85, 0x94, 0x22, 0x4d, 0x95,
- 0x10, 0x9b, 0xaa, 0x98, 0x78, 0x00, 0x81, 0xc8, 0xa3, 0x24, 0xe4, 0x79, 0xc0, 0x95, 0x92, 0x0e,
- 0x6d, 0x9d, 0xf8, 0x27, 0x00, 0xef, 0x66, 0x91, 0xa4, 0xbc, 0x9a, 0xa7, 0x12, 0x2d, 0xc6, 0x3c,
- 0x0f, 0x79, 0x69, 0xc8, 0x4c, 0x86, 0x0a, 0x58, 0xcc, 0x0d, 0x1b, 0x86, 0x8a, 0x8b, 0x05, 0xfc,
- 0x82, 0x8b, 0x05, 0x1c, 0xbf, 0x9e, 0x72, 0x36, 0x97, 0x0b, 0xc5, 0x63, 0x53, 0x93, 0xa1, 0xda,
- 0x2a, 0x4b, 0x52, 0xae, 0x1c, 0xdb, 0x54, 0x27, 0xfe, 0xf7, 0x0e, 0xf4, 0xd0, 0xe3, 0x44, 0x54,
- 0xe4, 0x2e, 0x38, 0x65, 0x80, 0x89, 0xe2, 0x1d, 0x8c, 0xd7, 0x76, 0xea, 0x09, 0xed, 0x50, 0x1e,
- 0x48, 0x6a, 0xaa, 0xe4, 0x01, 0xf4, 0x0b, 0xf9, 0x9a, 0x47, 0x72, 0x6f, 0xa1, 0xd5, 0x0c, 0xc6,
- 0xff, 0x35, 0xd0, 0x89, 0x48, 0x72, 0x49, 0x1b, 0x04, 0x79, 0x08, 0x50, 0x48, 0x8a, 0x43, 0x42,
- 0x7c, 0xf7, 0x6a, 0x7c, 0x0b, 0x42, 0xee, 0x41, 0xaf, 0x90, 0x6f, 0xc4, 0x5c, 0xce, 0x94, 0x85,
- 0x2b, 0xd0, 0x75, 0x9d, 0x6c, 0x81, 0x53, 0xc8, 0xb7, 0xa2, 0xd2, 0xae, 0xae, 0x40, 0x9a, 0x32,
- 0xb9, 0x0f, 0x4e, 0xa4, 0xe6, 0xa8, 0xe6, 0x3b, 0x18, 0xdf, 0x68, 0x80, 0x17, 0x23, 0xa6, 0x06,
- 0x42, 0x5c, 0xe8, 0x7d, 0x9a, 0xb3, 0x34, 0x91, 0x0b, 0xb7, 0xa7, 0x9a, 0x55, 0xa7, 0x38, 0xc8,
- 0x88, 0x05, 0x09, 0x4b, 0x77, 0xf1, 0xad, 0xad, 0xa8, 0xb7, 0xd6, 0x3a, 0xf1, 0x7f, 0x75, 0x60,
- 0x05, 0xef, 0x3b, 0xc8, 0x23, 0xf1, 0xaf, 0x9f, 0x7f, 0xdd, 0x4f, 0x7c, 0xcc, 0x11, 0xb6, 0x73,
- 0xd7, 0xed, 0xab, 0x3d, 0x35, 0x99, 0xff, 0x1e, 0x7a, 0x87, 0xd3, 0x23, 0xd5, 0xe5, 0x3b, 0x60,
- 0x97, 0xc1, 0xe1, 0xf4, 0xe8, 0x9a, 0x26, 0xeb, 0x22, 0xee, 0x8e, 0x5c, 0x14, 0xf5, 0xee, 0xc8,
- 0x45, 0x81, 0xbb, 0x53, 0x94, 0x62, 0xaa, 0x1a, 0xd8, 0xa1, 0x2a, 0xf6, 0x3f, 0xc3, 0xba, 0xde,
- 0x41, 0xf4, 0xb0, 0xcb, 0x25, 0x0f, 0x24, 0xb9, 0x0d, 0xdd, 0x42, 0x54, 0xe6, 0xf6, 0xff, 0x2f,
- 0xdb, 0x9c, 0x88, 0x8a, 0x62, 0x95, 0x6c, 0x83, 0x53, 0xaa, 0x0f, 0xcd, 0xfc, 0x36, 0x1a, 0x5c,
- 0xb3, 0xd8, 0xd4, 0x60, 0x70, 0x15, 0x23, 0xce, 0x64, 0x65, 0xfe, 0xac, 0x74, 0xe2, 0x3f, 0x83,
- 0xd5, 0x09, 0x2b, 0x59, 0x56, 0xaf, 0xe3, 0x23, 0xb0, 0xd1, 0x2d, 0x52, 0x77, 0x47, 0x83, 0xf1,
- 0x66, 0xdb, 0xd8, 0x65, 0x8d, 0x54, 0x03, 0xfd, 0xa3, 0xb6, 0xfc, 0xbd, 0x13, 0xf9, 0x52, 0x64,
- 0x0d, 0x97, 0xd5, 0xe2, 0x42, 0xf3, 0x81, 0xc8, 0x74, 0x3f, 0x56, 0xa9, 0x8a, 0xc9, 0xb6, 0x36,
- 0xaa, 0x1f, 0xd4, 0x9f, 0xd8, 0x10, 0xe6, 0xbf, 0x82, 0xf5, 0x0b, 0xb5, 0xfb, 0x9c, 0xc9, 0x79,
- 0xc9, 0xc9, 0x13, 0xe8, 0x71, 0xc5, 0x8a, 0x17, 0x5f, 0xab, 0x59, 0x0b, 0xa3, 0x35, 0xd4, 0x7f,
- 0x6a, 0x7c, 0x7f, 0x10, 0xa9, 0xc0, 0x51, 0x6d, 0x81, 0x9d, 0xe4, 0x91, 0xa8, 0x7d, 0xb7, 0x5a,
- 0x6e, 0x46, 0x4e, 0x75, 0xfd, 0x85, 0xfb, 0xed, 0xcc, 0xb3, 0x4e, 0xcf, 0x3c, 0xeb, 0xe7, 0x99,
- 0x67, 0x7d, 0x3d, 0xf7, 0x96, 0x4e, 0xcf, 0xbd, 0xa5, 0x1f, 0xe7, 0xde, 0xd2, 0xd4, 0x51, 0x9f,
- 0x3c, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x57, 0x93, 0xa7, 0xe2, 0x6e, 0x06, 0x00, 0x00,
+ // 704 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x54, 0xcf, 0x6f, 0xd3, 0x4a,
+ 0x10, 0xae, 0x93, 0x38, 0x69, 0x26, 0x55, 0x5f, 0xdf, 0xbe, 0xea, 0xc9, 0xaa, 0x9e, 0xa2, 0xc8,
+ 0x0f, 0xd1, 0x20, 0x4a, 0x41, 0x01, 0x89, 0x2b, 0x3f, 0xd2, 0x8a, 0x48, 0x40, 0xa3, 0x15, 0x17,
+ 0x8e, 0x9b, 0xf5, 0x3a, 0x71, 0x6a, 0x67, 0x8d, 0xbd, 0x51, 0x1b, 0xf1, 0x17, 0x70, 0xe3, 0xcf,
+ 0xe2, 0xd8, 0x23, 0x47, 0xd4, 0xc2, 0xff, 0x81, 0x66, 0x77, 0x1d, 0xbb, 0x52, 0xcb, 0x89, 0x23,
+ 0xa7, 0xcc, 0xec, 0x7c, 0x9b, 0xef, 0x9b, 0x6f, 0x76, 0x0c, 0xed, 0x3c, 0x38, 0x3d, 0x4c, 0x33,
+ 0xa9, 0x24, 0xd9, 0xd4, 0x3f, 0x49, 0x3e, 0xdd, 0x83, 0x09, 0xcb, 0x85, 0x39, 0xf5, 0x3f, 0x39,
+ 0xe0, 0x8e, 0x12, 0x36, 0x15, 0x64, 0x17, 0xdc, 0xb3, 0x28, 0x50, 0x33, 0xcf, 0xe9, 0x39, 0x7d,
+ 0x97, 0x9a, 0x84, 0xfc, 0x0b, 0xcd, 0x99, 0x88, 0xa6, 0x33, 0xe5, 0xd5, 0xf4, 0xb1, 0xcd, 0x08,
+ 0x81, 0x46, 0xc0, 0x14, 0xf3, 0xea, 0x3d, 0xa7, 0xbf, 0x45, 0x75, 0x4c, 0xfe, 0x83, 0xb6, 0x8a,
+ 0x12, 0x91, 0x2b, 0x96, 0xa4, 0x5e, 0xa3, 0xe7, 0xf4, 0xdb, 0xb4, 0x3c, 0x20, 0xdb, 0x50, 0x8b,
+ 0x02, 0xcf, 0xed, 0x39, 0xfd, 0x3a, 0xad, 0x45, 0x01, 0xd9, 0x81, 0x3a, 0x8f, 0x02, 0xaf, 0xa9,
+ 0x71, 0x18, 0xfa, 0x53, 0x68, 0x1f, 0x33, 0x2e, 0x9e, 0x2f, 0xa6, 0xb1, 0xc0, 0xf2, 0x8a, 0x9d,
+ 0x59, 0x31, 0x18, 0xa2, 0xc0, 0x34, 0x52, 0x7c, 0x66, 0x95, 0x98, 0x04, 0x85, 0x64, 0x32, 0x8e,
+ 0xb5, 0x10, 0x97, 0xea, 0x98, 0x74, 0x01, 0xb8, 0x5c, 0x84, 0x51, 0x20, 0x16, 0x5c, 0x68, 0x25,
+ 0x35, 0x5a, 0x39, 0xf1, 0xcf, 0x01, 0xde, 0xcd, 0x42, 0x45, 0x45, 0xbe, 0x8c, 0x15, 0xb6, 0x38,
+ 0x15, 0x8b, 0x40, 0x64, 0x96, 0xcc, 0x66, 0xa8, 0x80, 0x4d, 0x85, 0x65, 0xc3, 0x50, 0x73, 0x31,
+ 0x2e, 0xd6, 0x5c, 0x8c, 0x0b, 0xbc, 0x3d, 0x11, 0x6c, 0xa9, 0x56, 0x9a, 0xc7, 0xa5, 0x36, 0x43,
+ 0xb5, 0x79, 0x12, 0xc5, 0x42, 0x77, 0xec, 0x52, 0x93, 0xf8, 0xdf, 0x6b, 0xd0, 0xc2, 0x1e, 0xc7,
+ 0x32, 0x27, 0x77, 0xa1, 0x99, 0x71, 0x4c, 0x34, 0x6f, 0x67, 0xb0, 0x7d, 0x58, 0x4c, 0xe8, 0x90,
+ 0x0a, 0xae, 0xa8, 0xad, 0x92, 0x07, 0xd0, 0x4e, 0xd5, 0x6b, 0x11, 0xaa, 0xa3, 0x95, 0x51, 0xd3,
+ 0x19, 0xfc, 0x55, 0x42, 0xc7, 0x32, 0x5a, 0x28, 0x5a, 0x22, 0xc8, 0x43, 0x80, 0x54, 0x51, 0x1c,
+ 0x12, 0xe2, 0xeb, 0x37, 0xe3, 0x2b, 0x10, 0x72, 0x0f, 0x5a, 0xa9, 0x7a, 0x23, 0x97, 0x6a, 0xa6,
+ 0x5b, 0xb8, 0x01, 0x5d, 0xd4, 0xc9, 0x3e, 0x34, 0x53, 0xf5, 0x56, 0xe6, 0xa6, 0xab, 0x1b, 0x90,
+ 0xb6, 0x4c, 0xee, 0x43, 0x33, 0xd4, 0x73, 0xd4, 0xf3, 0xed, 0x0c, 0xfe, 0x29, 0x81, 0xeb, 0x11,
+ 0x53, 0x0b, 0x21, 0x1e, 0xb4, 0x3e, 0x2c, 0x59, 0x1c, 0xa9, 0x95, 0xd7, 0xd2, 0x66, 0x15, 0x29,
+ 0x0e, 0x32, 0x64, 0x3c, 0x62, 0xf1, 0x10, 0xdf, 0xda, 0xa6, 0x7e, 0x6b, 0x95, 0x13, 0x34, 0x3f,
+ 0x64, 0x5c, 0x8c, 0x86, 0x5e, 0xbb, 0xe7, 0xf4, 0x1b, 0xd4, 0x66, 0xfe, 0x8f, 0x1a, 0x6c, 0x22,
+ 0xcf, 0x68, 0x11, 0xca, 0x3f, 0x3e, 0xff, 0x6e, 0x9f, 0xeb, 0x6b, 0x9f, 0x4f, 0xa1, 0x75, 0x32,
+ 0x99, 0x6b, 0x97, 0xef, 0x80, 0x9b, 0xf1, 0x93, 0xc9, 0xfc, 0x16, 0x93, 0x4d, 0x11, 0x77, 0x4a,
+ 0xad, 0xd2, 0x62, 0xa7, 0xd4, 0x2a, 0xc5, 0x9d, 0x4a, 0x33, 0x39, 0xd1, 0x06, 0xd6, 0xa8, 0x8e,
+ 0x71, 0x77, 0xe4, 0x64, 0x3e, 0x1a, 0x6a, 0x9f, 0x1a, 0xd4, 0x24, 0xfe, 0x47, 0xd8, 0x31, 0x1b,
+ 0x8b, 0x9d, 0x0d, 0x85, 0x12, 0x5c, 0x91, 0xff, 0xa1, 0x9e, 0xca, 0xdc, 0x72, 0xfe, 0x7d, 0xbd,
+ 0xf9, 0xb1, 0xcc, 0x29, 0x56, 0xc9, 0x01, 0x34, 0x33, 0x7d, 0xd1, 0x4e, 0x75, 0xb7, 0xc4, 0x95,
+ 0x9f, 0x01, 0x6a, 0x31, 0x48, 0x1e, 0x0a, 0xa6, 0x72, 0xfb, 0x69, 0x33, 0x89, 0xff, 0x0c, 0xb6,
+ 0xc6, 0x2c, 0x63, 0x49, 0xb1, 0xbc, 0x8f, 0xc0, 0x45, 0x0f, 0x90, 0xba, 0xde, 0xef, 0x0c, 0xf6,
+ 0xaa, 0xed, 0x5e, 0xd7, 0x48, 0x0d, 0xd0, 0x9f, 0x57, 0xe5, 0x1f, 0x9d, 0xab, 0x97, 0x32, 0x29,
+ 0xb9, 0x9c, 0x0a, 0x17, 0x5a, 0xc2, 0x65, 0x62, 0x5c, 0xda, 0xa2, 0x3a, 0x26, 0x07, 0xa6, 0x51,
+ 0xf3, 0xcc, 0x7e, 0xc5, 0x86, 0x30, 0xff, 0x15, 0xec, 0xac, 0xd5, 0x1e, 0x0b, 0xa6, 0x96, 0x99,
+ 0x20, 0x4f, 0xa0, 0x25, 0x34, 0x2b, 0xfe, 0xf1, 0xad, 0x9a, 0x8d, 0x30, 0x5a, 0x40, 0xfd, 0xa7,
+ 0xb6, 0xef, 0xf7, 0x32, 0x96, 0x38, 0xc0, 0x7d, 0x70, 0xa3, 0x45, 0x28, 0x8b, 0xbe, 0x2b, 0x96,
+ 0xdb, 0x87, 0x40, 0x4d, 0xfd, 0x85, 0xf7, 0xe5, 0xb2, 0xeb, 0x5c, 0x5c, 0x76, 0x9d, 0x6f, 0x97,
+ 0x5d, 0xe7, 0xf3, 0x55, 0x77, 0xe3, 0xe2, 0xaa, 0xbb, 0xf1, 0xf5, 0xaa, 0xbb, 0x31, 0x69, 0xea,
+ 0x2b, 0x8f, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x6a, 0xf8, 0x9f, 0x9c, 0x06, 0x00, 0x00,
}
func (m *Image) Marshal() (dAtA []byte, err error) {
@@ -1055,6 +1072,11 @@
i = encodeVarintSdk(dAtA, i, uint64(len(m.FacialData)))
i += copy(dAtA[i:], m.FacialData)
}
+ if m.FaceID != 0 {
+ dAtA[i] = 0x48
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(m.FaceID))
+ }
return i, nil
}
@@ -1187,6 +1209,11 @@
i++
encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Prob))))
i += 4
+ }
+ if m.ObjID != 0 {
+ dAtA[i] = 0x20
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(m.ObjID))
}
return i, nil
}
@@ -1486,6 +1513,9 @@
if l > 0 {
n += 1 + l + sovSdk(uint64(l))
}
+ if m.FaceID != 0 {
+ n += 1 + sovSdk(uint64(m.FaceID))
+ }
return n
}
@@ -1547,6 +1577,9 @@
}
if m.Prob != 0 {
n += 5
+ }
+ if m.ObjID != 0 {
+ n += 1 + sovSdk(uint64(m.ObjID))
}
return n
}
@@ -2426,6 +2459,25 @@
m.FacialData = []byte{}
}
iNdEx = postIndex
+ case 9:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field FaceID", wireType)
+ }
+ m.FaceID = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.FaceID |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipSdk(dAtA[iNdEx:])
@@ -2886,6 +2938,25 @@
v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
iNdEx += 4
m.Prob = float32(math.Float32frombits(v))
+ case 4:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field ObjID", wireType)
+ }
+ m.ObjID = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.ObjID |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipSdk(dAtA[iNdEx:])
--
Gitblit v1.8.0