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 | 737 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 531 insertions(+), 206 deletions(-)
diff --git a/sdk.pb.go b/sdk.pb.go
index fc9c4ac..96b9780 100644
--- a/sdk.pb.go
+++ b/sdk.pb.go
@@ -24,9 +24,12 @@
// Image ipc struct
type Image struct {
- Width int32 `protobuf:"varint,1,opt,name=width,proto3" json:"width,omitempty"`
- Height int32 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
- Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+ Width int32 `protobuf:"varint,1,opt,name=width,proto3" json:"width,omitempty"`
+ Height int32 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
+ Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+ Timestamp string `protobuf:"bytes,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+ Id int64 `protobuf:"varint,5,opt,name=id,proto3" json:"id,omitempty"`
+ Cid string `protobuf:"bytes,6,opt,name=cid,proto3" json:"cid,omitempty"`
}
func (m *Image) Reset() { *m = Image{} }
@@ -81,6 +84,27 @@
return m.Data
}
return nil
+}
+
+func (m *Image) GetTimestamp() string {
+ if m != nil {
+ return m.Timestamp
+ }
+ return ""
+}
+
+func (m *Image) GetId() int64 {
+ if m != nil {
+ return m.Id
+ }
+ return 0
+}
+
+func (m *Image) GetCid() string {
+ if m != nil {
+ return m.Cid
+ }
+ return ""
}
type FaceAngle struct {
@@ -236,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{} }
@@ -325,6 +350,13 @@
return m.FacialData
}
return nil
+}
+
+func (m *FacePos) GetFaceID() uint64 {
+ if m != nil {
+ return m.FaceID
+ }
+ return 0
}
type FaceInfo struct {
@@ -439,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{} }
@@ -495,10 +528,18 @@
return 0
}
+func (m *ObjInfo) GetObjID() uint64 {
+ if m != nil {
+ return m.ObjID
+ }
+ return 0
+}
+
// sdk face property
type ResultFaceDetect struct {
Pos *FacePos `protobuf:"bytes,1,opt,name=pos,proto3" json:"pos,omitempty"`
Result *ThftResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
+ Feats []byte `protobuf:"bytes,3,opt,name=feats,proto3" json:"feats,omitempty"`
}
func (m *ResultFaceDetect) Reset() { *m = ResultFaceDetect{} }
@@ -548,6 +589,13 @@
return nil
}
+func (m *ResultFaceDetect) GetFeats() []byte {
+ if m != nil {
+ return m.Feats
+ }
+ return nil
+}
+
type ParamFacePos struct {
Faces []*ResultFaceDetect `protobuf:"bytes,1,rep,name=faces,proto3" json:"faces,omitempty"`
}
@@ -592,15 +640,75 @@
return nil
}
+type ResultFaceExtCom struct {
+ Feats []byte `protobuf:"bytes,1,opt,name=feats,proto3" json:"feats,omitempty"`
+ Comp []byte `protobuf:"bytes,2,opt,name=comp,proto3" json:"comp,omitempty"`
+ Pos *ResultFaceDetect `protobuf:"bytes,3,opt,name=pos,proto3" json:"pos,omitempty"`
+}
+
+func (m *ResultFaceExtCom) Reset() { *m = ResultFaceExtCom{} }
+func (m *ResultFaceExtCom) String() string { return proto.CompactTextString(m) }
+func (*ResultFaceExtCom) ProtoMessage() {}
+func (*ResultFaceExtCom) Descriptor() ([]byte, []int) {
+ return fileDescriptor_70decb0fb6f436df, []int{8}
+}
+func (m *ResultFaceExtCom) XXX_Unmarshal(b []byte) error {
+ return m.Unmarshal(b)
+}
+func (m *ResultFaceExtCom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ if deterministic {
+ return xxx_messageInfo_ResultFaceExtCom.Marshal(b, m, deterministic)
+ } else {
+ b = b[:cap(b)]
+ n, err := m.MarshalTo(b)
+ if err != nil {
+ return nil, err
+ }
+ return b[:n], nil
+ }
+}
+func (m *ResultFaceExtCom) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_ResultFaceExtCom.Merge(m, src)
+}
+func (m *ResultFaceExtCom) XXX_Size() int {
+ return m.Size()
+}
+func (m *ResultFaceExtCom) XXX_DiscardUnknown() {
+ xxx_messageInfo_ResultFaceExtCom.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ResultFaceExtCom proto.InternalMessageInfo
+
+func (m *ResultFaceExtCom) GetFeats() []byte {
+ if m != nil {
+ return m.Feats
+ }
+ return nil
+}
+
+func (m *ResultFaceExtCom) GetComp() []byte {
+ if m != nil {
+ return m.Comp
+ }
+ return nil
+}
+
+func (m *ResultFaceExtCom) GetPos() *ResultFaceDetect {
+ if m != nil {
+ return m.Pos
+ }
+ return nil
+}
+
type ParamFaceFeature struct {
- Feats [][]byte `protobuf:"bytes,1,rep,name=feats,proto3" json:"feats,omitempty"`
+ ExtComp []*ResultFaceExtCom `protobuf:"bytes,2,rep,name=extComp,proto3" json:"extComp,omitempty"`
}
func (m *ParamFaceFeature) Reset() { *m = ParamFaceFeature{} }
func (m *ParamFaceFeature) String() string { return proto.CompactTextString(m) }
func (*ParamFaceFeature) ProtoMessage() {}
func (*ParamFaceFeature) Descriptor() ([]byte, []int) {
- return fileDescriptor_70decb0fb6f436df, []int{8}
+ return fileDescriptor_70decb0fb6f436df, []int{9}
}
func (m *ParamFaceFeature) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -629,62 +737,9 @@
var xxx_messageInfo_ParamFaceFeature proto.InternalMessageInfo
-func (m *ParamFaceFeature) GetFeats() [][]byte {
+func (m *ParamFaceFeature) GetExtComp() []*ResultFaceExtCom {
if m != nil {
- return m.Feats
- }
- return nil
-}
-
-// sdk face extract
-type ParamFaceCompare struct {
- Feat1 []byte `protobuf:"bytes,1,opt,name=feat1,proto3" json:"feat1,omitempty"`
- Feat2 []byte `protobuf:"bytes,2,opt,name=feat2,proto3" json:"feat2,omitempty"`
-}
-
-func (m *ParamFaceCompare) Reset() { *m = ParamFaceCompare{} }
-func (m *ParamFaceCompare) String() string { return proto.CompactTextString(m) }
-func (*ParamFaceCompare) ProtoMessage() {}
-func (*ParamFaceCompare) Descriptor() ([]byte, []int) {
- return fileDescriptor_70decb0fb6f436df, []int{9}
-}
-func (m *ParamFaceCompare) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
-}
-func (m *ParamFaceCompare) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_ParamFaceCompare.Marshal(b, m, deterministic)
- } else {
- b = b[:cap(b)]
- n, err := m.MarshalTo(b)
- if err != nil {
- return nil, err
- }
- return b[:n], nil
- }
-}
-func (m *ParamFaceCompare) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ParamFaceCompare.Merge(m, src)
-}
-func (m *ParamFaceCompare) XXX_Size() int {
- return m.Size()
-}
-func (m *ParamFaceCompare) XXX_DiscardUnknown() {
- xxx_messageInfo_ParamFaceCompare.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ParamFaceCompare proto.InternalMessageInfo
-
-func (m *ParamFaceCompare) GetFeat1() []byte {
- if m != nil {
- return m.Feat1
- }
- return nil
-}
-
-func (m *ParamFaceCompare) GetFeat2() []byte {
- if m != nil {
- return m.Feat2
+ return m.ExtComp
}
return nil
}
@@ -743,54 +798,59 @@
proto.RegisterType((*ObjInfo)(nil), "protomsg.ObjInfo")
proto.RegisterType((*ResultFaceDetect)(nil), "protomsg.ResultFaceDetect")
proto.RegisterType((*ParamFacePos)(nil), "protomsg.ParamFacePos")
+ proto.RegisterType((*ResultFaceExtCom)(nil), "protomsg.ResultFaceExtCom")
proto.RegisterType((*ParamFaceFeature)(nil), "protomsg.ParamFaceFeature")
- proto.RegisterType((*ParamFaceCompare)(nil), "protomsg.ParamFaceCompare")
proto.RegisterType((*ParamYoloObj)(nil), "protomsg.ParamYoloObj")
}
func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) }
var fileDescriptor_70decb0fb6f436df = []byte{
- // 624 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x54, 0x4d, 0x6f, 0xd3, 0x4c,
- 0x10, 0xae, 0x93, 0xda, 0x69, 0xa6, 0xd5, 0xfb, 0x96, 0xa5, 0x42, 0x56, 0x0f, 0x56, 0x64, 0x10,
- 0x35, 0x02, 0x0a, 0x0d, 0x07, 0x6e, 0x88, 0x8f, 0x52, 0xa9, 0x12, 0xd0, 0x68, 0x05, 0x07, 0x8e,
- 0x6b, 0x67, 0xfd, 0x51, 0x1c, 0xaf, 0xb1, 0x37, 0x2a, 0xfe, 0x17, 0xfc, 0x2c, 0x0e, 0x1c, 0x7a,
- 0xe4, 0x88, 0x5a, 0xf1, 0x3f, 0xd0, 0xec, 0xae, 0x6b, 0x57, 0x0a, 0x27, 0xae, 0x9c, 0x32, 0xcf,
- 0xcc, 0xe3, 0xf9, 0x78, 0x66, 0x27, 0x30, 0xae, 0xe7, 0x9f, 0xf6, 0xcb, 0x4a, 0x48, 0x41, 0x36,
- 0xd4, 0xcf, 0xa2, 0x4e, 0x76, 0x21, 0x64, 0x35, 0xd7, 0x5e, 0xff, 0x18, 0xec, 0xe3, 0x05, 0x4b,
- 0x38, 0xd9, 0x01, 0xfb, 0x2c, 0x9b, 0xcb, 0xd4, 0xb5, 0x26, 0x56, 0x60, 0x53, 0x0d, 0xc8, 0x2d,
- 0x70, 0x52, 0x9e, 0x25, 0xa9, 0x74, 0x07, 0xca, 0x6d, 0x10, 0x21, 0xb0, 0x3e, 0x67, 0x92, 0xb9,
- 0xc3, 0x89, 0x15, 0x6c, 0x51, 0x65, 0xfb, 0x09, 0x8c, 0x8f, 0x58, 0xc4, 0x5f, 0x14, 0x49, 0xce,
- 0xc9, 0x36, 0x0c, 0x1b, 0x76, 0x66, 0x92, 0xa1, 0x89, 0x05, 0xca, 0x4c, 0x46, 0xa9, 0xc9, 0xa4,
- 0x01, 0x26, 0xaa, 0x44, 0x9e, 0xab, 0x44, 0x36, 0x55, 0x36, 0xf1, 0x00, 0x22, 0x51, 0xc4, 0xd9,
- 0x9c, 0x17, 0x11, 0x77, 0xd7, 0x27, 0x56, 0x30, 0xa0, 0x3d, 0x8f, 0xff, 0x05, 0xe0, 0x7d, 0x1a,
- 0x4b, 0xca, 0xeb, 0x65, 0x2e, 0xb1, 0xc5, 0x84, 0x17, 0x73, 0x5e, 0x99, 0x62, 0x06, 0x61, 0x07,
- 0x2c, 0xe1, 0xa6, 0x1a, 0x9a, 0xaa, 0x16, 0x8b, 0xf8, 0x55, 0x2d, 0x16, 0x71, 0xfc, 0x3a, 0xe4,
- 0x6c, 0x29, 0x1b, 0x55, 0xc7, 0xa6, 0x06, 0x61, 0xb7, 0xf5, 0x22, 0xcb, 0xb9, 0x6b, 0xeb, 0x6e,
- 0x15, 0xf0, 0xbf, 0x0f, 0x60, 0x84, 0x33, 0xce, 0x44, 0x4d, 0xee, 0x82, 0x53, 0x45, 0x08, 0x54,
- 0xdd, 0xcd, 0xe9, 0x7f, 0xfb, 0xad, 0xc0, 0xfb, 0x94, 0x47, 0x92, 0x9a, 0x28, 0x79, 0x08, 0xe3,
- 0x52, 0xbe, 0xe1, 0xb1, 0x7c, 0xdd, 0xe8, 0x6e, 0x36, 0xa7, 0xff, 0x77, 0xd4, 0x99, 0xc8, 0x0a,
- 0x49, 0x3b, 0x06, 0x79, 0x04, 0x50, 0x4a, 0x8a, 0x22, 0x23, 0x7f, 0xb8, 0x9a, 0xdf, 0xa3, 0x90,
- 0x7b, 0x30, 0x2a, 0xe5, 0x5b, 0xb1, 0x94, 0xa9, 0x1a, 0x61, 0x05, 0xbb, 0x8d, 0x93, 0x3d, 0x70,
- 0x4a, 0xf9, 0x4e, 0xd4, 0x7a, 0xaa, 0x15, 0x4c, 0x13, 0x26, 0xf7, 0xc1, 0x89, 0xd5, 0x1e, 0x5d,
- 0x47, 0x11, 0x6f, 0x76, 0xc4, 0xab, 0x15, 0x53, 0x43, 0x21, 0x2e, 0x8c, 0x3e, 0x2f, 0x59, 0x9e,
- 0xc9, 0xc6, 0x1d, 0x29, 0xb1, 0x5a, 0x88, 0x8b, 0x8c, 0x59, 0x94, 0xb1, 0xfc, 0x10, 0xdf, 0xca,
- 0x86, 0x7a, 0x2b, 0x3d, 0x8f, 0xff, 0x6b, 0x00, 0x1b, 0x98, 0xef, 0xb8, 0x88, 0xc5, 0x3f, 0x3d,
- 0xff, 0x5a, 0x4f, 0x7c, 0xcc, 0x31, 0xca, 0x79, 0xe8, 0x8e, 0x27, 0x56, 0x30, 0xa4, 0x06, 0xf9,
- 0x1f, 0x60, 0x74, 0x12, 0x9e, 0x2a, 0x95, 0xef, 0x80, 0x5d, 0x45, 0x27, 0xe1, 0xe9, 0x1f, 0x44,
- 0xd6, 0x41, 0xbc, 0x1d, 0xd9, 0x94, 0xed, 0xed, 0xc8, 0xa6, 0xc4, 0xdb, 0x29, 0x2b, 0x11, 0x2a,
- 0x01, 0x07, 0x54, 0xd9, 0x3e, 0x87, 0x6d, 0x7d, 0x83, 0x38, 0xc3, 0x21, 0x97, 0x3c, 0x92, 0xe4,
- 0x36, 0x0c, 0x4b, 0x51, 0x9b, 0xec, 0x37, 0xae, 0x8f, 0x39, 0x13, 0x35, 0xc5, 0x28, 0x79, 0x00,
- 0x4e, 0xa5, 0x3e, 0x34, 0xfb, 0xdb, 0xe9, 0x78, 0xdd, 0x61, 0x53, 0xc3, 0xf1, 0x9f, 0xc3, 0xd6,
- 0x8c, 0x55, 0x6c, 0xd1, 0x1e, 0xde, 0x63, 0xb0, 0x71, 0x2e, 0x2c, 0x32, 0x0c, 0x36, 0xa7, 0xbb,
- 0xfd, 0x11, 0xae, 0x77, 0x43, 0x35, 0xd1, 0x0f, 0x60, 0xfb, 0x2a, 0xc3, 0x11, 0x67, 0x72, 0x59,
- 0xa9, 0xff, 0xbb, 0x98, 0x33, 0xa9, 0xb3, 0x6c, 0x51, 0x0d, 0xfc, 0x67, 0x3d, 0xe6, 0x2b, 0xb1,
- 0x28, 0x59, 0xc7, 0x3c, 0x50, 0x43, 0x19, 0xe6, 0x41, 0xeb, 0x9d, 0xaa, 0x11, 0x8c, 0x77, 0xea,
- 0x3f, 0x35, 0xbd, 0x7e, 0x14, 0xb9, 0x40, 0x21, 0xf7, 0xc0, 0xce, 0x8a, 0x58, 0xb4, 0xbd, 0xf6,
- 0x04, 0x31, 0x0b, 0xa1, 0x3a, 0xfe, 0xd2, 0xfd, 0x76, 0xe1, 0x59, 0xe7, 0x17, 0x9e, 0xf5, 0xf3,
- 0xc2, 0xb3, 0xbe, 0x5e, 0x7a, 0x6b, 0xe7, 0x97, 0xde, 0xda, 0x8f, 0x4b, 0x6f, 0x2d, 0x74, 0xd4,
- 0x27, 0x4f, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xba, 0xd3, 0x09, 0x2b, 0xcb, 0x05, 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) {
@@ -823,6 +883,23 @@
i++
i = encodeVarintSdk(dAtA, i, uint64(len(m.Data)))
i += copy(dAtA[i:], m.Data)
+ }
+ if len(m.Timestamp) > 0 {
+ dAtA[i] = 0x22
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(len(m.Timestamp)))
+ i += copy(dAtA[i:], m.Timestamp)
+ }
+ if m.Id != 0 {
+ dAtA[i] = 0x28
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(m.Id))
+ }
+ if len(m.Cid) > 0 {
+ dAtA[i] = 0x32
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(len(m.Cid)))
+ i += copy(dAtA[i:], m.Cid)
}
return i, nil
}
@@ -995,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
}
@@ -1128,6 +1210,11 @@
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
}
@@ -1166,6 +1253,12 @@
}
i += n15
}
+ if len(m.Feats) > 0 {
+ dAtA[i] = 0x1a
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(len(m.Feats)))
+ i += copy(dAtA[i:], m.Feats)
+ }
return i, nil
}
@@ -1199,6 +1292,46 @@
return i, nil
}
+func (m *ResultFaceExtCom) Marshal() (dAtA []byte, err error) {
+ size := m.Size()
+ dAtA = make([]byte, size)
+ n, err := m.MarshalTo(dAtA)
+ if err != nil {
+ return nil, err
+ }
+ return dAtA[:n], nil
+}
+
+func (m *ResultFaceExtCom) MarshalTo(dAtA []byte) (int, error) {
+ var i int
+ _ = i
+ var l int
+ _ = l
+ if len(m.Feats) > 0 {
+ dAtA[i] = 0xa
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(len(m.Feats)))
+ i += copy(dAtA[i:], m.Feats)
+ }
+ if len(m.Comp) > 0 {
+ dAtA[i] = 0x12
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(len(m.Comp)))
+ i += copy(dAtA[i:], m.Comp)
+ }
+ if m.Pos != nil {
+ dAtA[i] = 0x1a
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(m.Pos.Size()))
+ n16, err16 := m.Pos.MarshalTo(dAtA[i:])
+ if err16 != nil {
+ return 0, err16
+ }
+ i += n16
+ }
+ return i, nil
+}
+
func (m *ParamFaceFeature) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
@@ -1214,43 +1347,17 @@
_ = i
var l int
_ = l
- if len(m.Feats) > 0 {
- for _, b := range m.Feats {
- dAtA[i] = 0xa
+ if len(m.ExtComp) > 0 {
+ for _, msg := range m.ExtComp {
+ dAtA[i] = 0x12
i++
- i = encodeVarintSdk(dAtA, i, uint64(len(b)))
- i += copy(dAtA[i:], b)
+ i = encodeVarintSdk(dAtA, i, uint64(msg.Size()))
+ n, err := msg.MarshalTo(dAtA[i:])
+ if err != nil {
+ return 0, err
+ }
+ i += n
}
- }
- return i, nil
-}
-
-func (m *ParamFaceCompare) Marshal() (dAtA []byte, err error) {
- size := m.Size()
- dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
- if err != nil {
- return nil, err
- }
- return dAtA[:n], nil
-}
-
-func (m *ParamFaceCompare) MarshalTo(dAtA []byte) (int, error) {
- var i int
- _ = i
- var l int
- _ = l
- if len(m.Feat1) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintSdk(dAtA, i, uint64(len(m.Feat1)))
- i += copy(dAtA[i:], m.Feat1)
- }
- if len(m.Feat2) > 0 {
- dAtA[i] = 0x12
- i++
- i = encodeVarintSdk(dAtA, i, uint64(len(m.Feat2)))
- i += copy(dAtA[i:], m.Feat2)
}
return i, nil
}
@@ -1307,6 +1414,17 @@
n += 1 + sovSdk(uint64(m.Height))
}
l = len(m.Data)
+ if l > 0 {
+ n += 1 + l + sovSdk(uint64(l))
+ }
+ l = len(m.Timestamp)
+ if l > 0 {
+ n += 1 + l + sovSdk(uint64(l))
+ }
+ if m.Id != 0 {
+ n += 1 + sovSdk(uint64(m.Id))
+ }
+ l = len(m.Cid)
if l > 0 {
n += 1 + l + sovSdk(uint64(l))
}
@@ -1395,6 +1513,9 @@
if l > 0 {
n += 1 + l + sovSdk(uint64(l))
}
+ if m.FaceID != 0 {
+ n += 1 + sovSdk(uint64(m.FaceID))
+ }
return n
}
@@ -1457,6 +1578,9 @@
if m.Prob != 0 {
n += 5
}
+ if m.ObjID != 0 {
+ n += 1 + sovSdk(uint64(m.ObjID))
+ }
return n
}
@@ -1472,6 +1596,10 @@
}
if m.Result != nil {
l = m.Result.Size()
+ n += 1 + l + sovSdk(uint64(l))
+ }
+ l = len(m.Feats)
+ if l > 0 {
n += 1 + l + sovSdk(uint64(l))
}
return n
@@ -1492,34 +1620,38 @@
return n
}
+func (m *ResultFaceExtCom) Size() (n int) {
+ if m == nil {
+ return 0
+ }
+ var l int
+ _ = l
+ l = len(m.Feats)
+ if l > 0 {
+ n += 1 + l + sovSdk(uint64(l))
+ }
+ l = len(m.Comp)
+ if l > 0 {
+ n += 1 + l + sovSdk(uint64(l))
+ }
+ if m.Pos != nil {
+ l = m.Pos.Size()
+ n += 1 + l + sovSdk(uint64(l))
+ }
+ return n
+}
+
func (m *ParamFaceFeature) Size() (n int) {
if m == nil {
return 0
}
var l int
_ = l
- if len(m.Feats) > 0 {
- for _, b := range m.Feats {
- l = len(b)
+ if len(m.ExtComp) > 0 {
+ for _, e := range m.ExtComp {
+ l = e.Size()
n += 1 + l + sovSdk(uint64(l))
}
- }
- return n
-}
-
-func (m *ParamFaceCompare) Size() (n int) {
- if m == nil {
- return 0
- }
- var l int
- _ = l
- l = len(m.Feat1)
- if l > 0 {
- n += 1 + l + sovSdk(uint64(l))
- }
- l = len(m.Feat2)
- if l > 0 {
- n += 1 + l + sovSdk(uint64(l))
}
return n
}
@@ -1652,6 +1784,89 @@
if m.Data == nil {
m.Data = []byte{}
}
+ iNdEx = postIndex
+ case 4:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ stringLen |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ intStringLen := int(stringLen)
+ if intStringLen < 0 {
+ return ErrInvalidLengthSdk
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthSdk
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Timestamp = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 5:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
+ }
+ m.Id = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.Id |= int64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ case 6:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Cid", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ stringLen |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ intStringLen := int(stringLen)
+ if intStringLen < 0 {
+ return ErrInvalidLengthSdk
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthSdk
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Cid = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
@@ -2244,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:])
@@ -2704,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:])
@@ -2829,6 +3082,40 @@
return err
}
iNdEx = postIndex
+ case 3:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Feats", wireType)
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ byteLen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if byteLen < 0 {
+ return ErrInvalidLengthSdk
+ }
+ postIndex := iNdEx + byteLen
+ if postIndex < 0 {
+ return ErrInvalidLengthSdk
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Feats = append(m.Feats[:0], dAtA[iNdEx:postIndex]...)
+ if m.Feats == nil {
+ m.Feats = []byte{}
+ }
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipSdk(dAtA[iNdEx:])
@@ -2940,7 +3227,7 @@
}
return nil
}
-func (m *ParamFaceFeature) Unmarshal(dAtA []byte) error {
+func (m *ResultFaceExtCom) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
@@ -2963,10 +3250,10 @@
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
- return fmt.Errorf("proto: ParamFaceFeature: wiretype end group for non-group")
+ return fmt.Errorf("proto: ResultFaceExtCom: wiretype end group for non-group")
}
if fieldNum <= 0 {
- return fmt.Errorf("proto: ParamFaceFeature: illegal tag %d (wire type %d)", fieldNum, wire)
+ return fmt.Errorf("proto: ResultFaceExtCom: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
@@ -2998,8 +3285,80 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.Feats = append(m.Feats, make([]byte, postIndex-iNdEx))
- copy(m.Feats[len(m.Feats)-1], dAtA[iNdEx:postIndex])
+ m.Feats = append(m.Feats[:0], dAtA[iNdEx:postIndex]...)
+ if m.Feats == nil {
+ m.Feats = []byte{}
+ }
+ iNdEx = postIndex
+ case 2:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Comp", wireType)
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ byteLen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if byteLen < 0 {
+ return ErrInvalidLengthSdk
+ }
+ postIndex := iNdEx + byteLen
+ if postIndex < 0 {
+ return ErrInvalidLengthSdk
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Comp = append(m.Comp[:0], dAtA[iNdEx:postIndex]...)
+ if m.Comp == nil {
+ m.Comp = []byte{}
+ }
+ iNdEx = postIndex
+ case 3:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Pos", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthSdk
+ }
+ postIndex := iNdEx + msglen
+ if postIndex < 0 {
+ return ErrInvalidLengthSdk
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ if m.Pos == nil {
+ m.Pos = &ResultFaceDetect{}
+ }
+ if err := m.Pos.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
iNdEx = postIndex
default:
iNdEx = preIndex
@@ -3025,7 +3384,7 @@
}
return nil
}
-func (m *ParamFaceCompare) Unmarshal(dAtA []byte) error {
+func (m *ParamFaceFeature) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
@@ -3048,51 +3407,17 @@
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
- return fmt.Errorf("proto: ParamFaceCompare: wiretype end group for non-group")
+ return fmt.Errorf("proto: ParamFaceFeature: wiretype end group for non-group")
}
if fieldNum <= 0 {
- return fmt.Errorf("proto: ParamFaceCompare: illegal tag %d (wire type %d)", fieldNum, wire)
+ return fmt.Errorf("proto: ParamFaceFeature: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
- case 1:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Feat1", wireType)
- }
- var byteLen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowSdk
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- byteLen |= int(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if byteLen < 0 {
- return ErrInvalidLengthSdk
- }
- postIndex := iNdEx + byteLen
- if postIndex < 0 {
- return ErrInvalidLengthSdk
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.Feat1 = append(m.Feat1[:0], dAtA[iNdEx:postIndex]...)
- if m.Feat1 == nil {
- m.Feat1 = []byte{}
- }
- iNdEx = postIndex
case 2:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Feat2", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field ExtComp", wireType)
}
- var byteLen int
+ var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowSdk
@@ -3102,24 +3427,24 @@
}
b := dAtA[iNdEx]
iNdEx++
- byteLen |= int(b&0x7F) << shift
+ msglen |= int(b&0x7F) << shift
if b < 0x80 {
break
}
}
- if byteLen < 0 {
+ if msglen < 0 {
return ErrInvalidLengthSdk
}
- postIndex := iNdEx + byteLen
+ postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthSdk
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.Feat2 = append(m.Feat2[:0], dAtA[iNdEx:postIndex]...)
- if m.Feat2 == nil {
- m.Feat2 = []byte{}
+ m.ExtComp = append(m.ExtComp, &ResultFaceExtCom{})
+ if err := m.ExtComp[len(m.ExtComp)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
}
iNdEx = postIndex
default:
--
Gitblit v1.8.0