From 9b1a4d42676346260e980637fad5dff0c12a141c Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期日, 16 六月 2019 16:27:12 +0800
Subject: [PATCH] change detect
---
protomsg.proto | 11
protomsg.pb.go | 573 +++++++++++++++++++-------------------------------------
2 files changed, 202 insertions(+), 382 deletions(-)
diff --git a/protomsg.pb.go b/protomsg.pb.go
index 618c5ce..764f589 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -2099,8 +2099,9 @@
// sdk face property
type ParamFacePos struct {
- Pos *FacePos `protobuf:"bytes,1,opt,name=pos,proto3" json:"pos,omitempty"`
- Img *Image `protobuf:"bytes,2,opt,name=img,proto3" json:"img,omitempty"`
+ Pos *FacePos `protobuf:"bytes,1,opt,name=pos,proto3" json:"pos,omitempty"`
+ Result *ThftResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
+ Img *Image `protobuf:"bytes,3,opt,name=img,proto3" json:"img,omitempty"`
}
func (m *ParamFacePos) Reset() { *m = ParamFacePos{} }
@@ -2139,6 +2140,13 @@
func (m *ParamFacePos) GetPos() *FacePos {
if m != nil {
return m.Pos
+ }
+ return nil
+}
+
+func (m *ParamFacePos) GetResult() *ThftResult {
+ if m != nil {
+ return m.Result
}
return nil
}
@@ -2203,59 +2211,6 @@
return nil
}
-// sdk face property
-type ParamFaceProperty struct {
- Result *ThftResult `protobuf:"bytes,1,opt,name=result,proto3" json:"result,omitempty"`
- Img *Image `protobuf:"bytes,2,opt,name=img,proto3" json:"img,omitempty"`
-}
-
-func (m *ParamFaceProperty) Reset() { *m = ParamFaceProperty{} }
-func (m *ParamFaceProperty) String() string { return proto.CompactTextString(m) }
-func (*ParamFaceProperty) ProtoMessage() {}
-func (*ParamFaceProperty) Descriptor() ([]byte, []int) {
- return fileDescriptor_32de24555f916688, []int{28}
-}
-func (m *ParamFaceProperty) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
-}
-func (m *ParamFaceProperty) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_ParamFaceProperty.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 *ParamFaceProperty) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ParamFaceProperty.Merge(m, src)
-}
-func (m *ParamFaceProperty) XXX_Size() int {
- return m.Size()
-}
-func (m *ParamFaceProperty) XXX_DiscardUnknown() {
- xxx_messageInfo_ParamFaceProperty.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ParamFaceProperty proto.InternalMessageInfo
-
-func (m *ParamFaceProperty) GetResult() *ThftResult {
- if m != nil {
- return m.Result
- }
- return nil
-}
-
-func (m *ParamFaceProperty) GetImg() *Image {
- if m != nil {
- return m.Img
- }
- return nil
-}
-
// sdk yolo detect
type ParamYoloObj struct {
Infos []*ObjInfo `protobuf:"bytes,1,rep,name=infos,proto3" json:"infos,omitempty"`
@@ -2266,7 +2221,7 @@
func (m *ParamYoloObj) String() string { return proto.CompactTextString(m) }
func (*ParamYoloObj) ProtoMessage() {}
func (*ParamYoloObj) Descriptor() ([]byte, []int) {
- return fileDescriptor_32de24555f916688, []int{29}
+ return fileDescriptor_32de24555f916688, []int{28}
}
func (m *ParamYoloObj) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -2321,7 +2276,7 @@
func (m *DbChangeMessage) String() string { return proto.CompactTextString(m) }
func (*DbChangeMessage) ProtoMessage() {}
func (*DbChangeMessage) Descriptor() ([]byte, []int) {
- return fileDescriptor_32de24555f916688, []int{30}
+ return fileDescriptor_32de24555f916688, []int{29}
}
func (m *DbChangeMessage) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -2393,7 +2348,7 @@
func (m *CameraPolygon) String() string { return proto.CompactTextString(m) }
func (*CameraPolygon) ProtoMessage() {}
func (*CameraPolygon) Descriptor() ([]byte, []int) {
- return fileDescriptor_32de24555f916688, []int{31}
+ return fileDescriptor_32de24555f916688, []int{30}
}
func (m *CameraPolygon) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -2510,7 +2465,6 @@
proto.RegisterType((*ObjInfo)(nil), "protomsg.ObjInfo")
proto.RegisterType((*ParamFacePos)(nil), "protomsg.ParamFacePos")
proto.RegisterType((*ParamFaceCompare)(nil), "protomsg.ParamFaceCompare")
- proto.RegisterType((*ParamFaceProperty)(nil), "protomsg.ParamFaceProperty")
proto.RegisterType((*ParamYoloObj)(nil), "protomsg.ParamYoloObj")
proto.RegisterType((*DbChangeMessage)(nil), "protomsg.DbChangeMessage")
proto.RegisterType((*CameraPolygon)(nil), "protomsg.CameraPolygon")
@@ -2519,135 +2473,134 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 2036 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0xcd, 0x92, 0x1c, 0x47,
- 0xf1, 0x57, 0xcf, 0x77, 0xe7, 0xcc, 0xac, 0x47, 0xf5, 0xd7, 0xdf, 0x1e, 0xcb, 0x78, 0x59, 0xb5,
- 0x04, 0x5e, 0x84, 0x11, 0xc1, 0xda, 0x07, 0xc3, 0x81, 0x88, 0xb5, 0x56, 0x22, 0x36, 0x42, 0x96,
- 0xd7, 0xb5, 0x6b, 0x11, 0xf8, 0xc0, 0x44, 0x4d, 0x57, 0x4d, 0x6f, 0x7b, 0x7a, 0xba, 0x9b, 0xea,
- 0x1a, 0xad, 0xfa, 0xc0, 0x33, 0xc0, 0x91, 0x77, 0xe0, 0x45, 0x7c, 0xe0, 0xe0, 0x13, 0xc1, 0x0d,
- 0x42, 0x0a, 0x2e, 0x10, 0xbc, 0x03, 0x91, 0x59, 0xd5, 0x3d, 0x3d, 0xbb, 0xab, 0x40, 0x11, 0x5c,
- 0xb9, 0xe5, 0xd7, 0x64, 0x65, 0xfd, 0x32, 0x2b, 0x33, 0x7b, 0x60, 0x27, 0xd7, 0x99, 0xc9, 0x56,
- 0x45, 0xf4, 0x80, 0x08, 0x36, 0xa8, 0xf8, 0xe0, 0x0b, 0xf0, 0xcf, 0x44, 0xb1, 0x7c, 0x22, 0xe6,
- 0x2a, 0x61, 0x6f, 0x43, 0xcf, 0x88, 0x62, 0x19, 0xcb, 0xa9, 0xb7, 0xe7, 0xed, 0xfb, 0xdc, 0x71,
- 0x28, 0x2f, 0xe4, 0x32, 0x96, 0xc5, 0xb4, 0xb5, 0xd7, 0x46, 0xb9, 0xe5, 0xd8, 0x2d, 0xe8, 0xc6,
- 0xa9, 0x54, 0x2f, 0xa6, 0xed, 0x3d, 0x6f, 0xbf, 0xcb, 0x2d, 0x13, 0xfc, 0xd9, 0x03, 0x38, 0x95,
- 0xcb, 0xcf, 0x54, 0x51, 0x88, 0x48, 0xb1, 0x09, 0xb4, 0xc3, 0xda, 0x23, 0x92, 0xec, 0x47, 0xd0,
- 0x47, 0xc7, 0x89, 0x98, 0x4f, 0x5b, 0x7b, 0xde, 0xfe, 0xf0, 0xe0, 0xff, 0x1e, 0xd4, 0xf1, 0xd5,
- 0xc1, 0xf0, 0xca, 0x86, 0x31, 0xe8, 0x48, 0x61, 0x04, 0x1d, 0x32, 0xe2, 0x44, 0xb3, 0x4f, 0xa0,
- 0xa7, 0x8a, 0x38, 0x5d, 0x64, 0xd3, 0xce, 0x5e, 0x7b, 0x7f, 0x78, 0xb0, 0xb7, 0xf1, 0xb0, 0x39,
- 0xfa, 0xc1, 0x23, 0x32, 0x79, 0x94, 0x1a, 0x5d, 0x72, 0x67, 0x7f, 0xfb, 0xa7, 0x30, 0x6c, 0x88,
- 0x31, 0xba, 0xa5, 0x2a, 0xab, 0xe8, 0x96, 0xaa, 0xc4, 0x4b, 0x3d, 0x17, 0xc9, 0x5a, 0x51, 0x6c,
- 0x3e, 0xb7, 0xcc, 0xcf, 0x5a, 0x9f, 0x78, 0xc1, 0x31, 0x74, 0x8f, 0x57, 0x78, 0xa5, 0x5b, 0xd0,
- 0xbd, 0x88, 0xa5, 0x39, 0xa7, 0x9f, 0x75, 0xb9, 0x65, 0x10, 0xa5, 0x73, 0x15, 0x47, 0xe7, 0x86,
- 0x7e, 0xd9, 0xe5, 0x8e, 0xbb, 0x2e, 0xfe, 0xe0, 0x31, 0x74, 0x0e, 0xb5, 0x12, 0x6c, 0x07, 0x5a,
- 0x0e, 0x9b, 0x2e, 0x6f, 0xc5, 0x92, 0xdd, 0x86, 0x41, 0x2e, 0xb4, 0x4a, 0x4d, 0x2c, 0x9d, 0x97,
- 0x9a, 0x47, 0x3f, 0xa9, 0x58, 0x29, 0xf2, 0xe3, 0x73, 0xa2, 0x83, 0x6f, 0x5a, 0xd0, 0x7b, 0x28,
- 0x56, 0x4a, 0x37, 0x5d, 0xf9, 0xe4, 0xaa, 0x32, 0x6f, 0x6d, 0xcc, 0x51, 0x66, 0xca, 0x5c, 0xb9,
- 0x7c, 0x11, 0x8d, 0x32, 0x21, 0xa5, 0x9e, 0x76, 0xac, 0x1d, 0xd2, 0x78, 0x15, 0xa1, 0x95, 0x88,
- 0xe5, 0xb4, 0x6b, 0xaf, 0x62, 0x39, 0xf6, 0x1d, 0xf0, 0x93, 0x2c, 0x8d, 0x62, 0xb3, 0x96, 0x6a,
- 0xda, 0xdb, 0xf3, 0xf6, 0x5b, 0x7c, 0x23, 0xc0, 0xe0, 0x13, 0x61, 0xac, 0xb2, 0x4f, 0xca, 0x9a,
- 0xc7, 0x53, 0xb4, 0x29, 0xf2, 0xe9, 0xc0, 0x9e, 0x82, 0x34, 0x45, 0x9c, 0x4f, 0x7d, 0x17, 0x71,
- 0x8e, 0x36, 0x79, 0xa6, 0xcd, 0x14, 0x6c, 0x74, 0x48, 0xa3, 0xcf, 0x75, 0xa1, 0x34, 0xdd, 0x64,
- 0x48, 0x96, 0x35, 0x6f, 0xc1, 0x2a, 0x8a, 0x8b, 0x4c, 0xcb, 0xe9, 0xc8, 0xea, 0x2a, 0x1e, 0x53,
- 0x34, 0xd7, 0x22, 0x95, 0xd3, 0xb1, 0xcd, 0x22, 0x31, 0xf8, 0x0b, 0xad, 0x0a, 0xa5, 0x9f, 0x2b,
- 0x39, 0xdd, 0xb1, 0xbf, 0xa8, 0xf8, 0x20, 0x84, 0x9b, 0x16, 0xc9, 0xc3, 0x54, 0x62, 0x15, 0x1e,
- 0xa7, 0x8b, 0x8c, 0xed, 0x43, 0x2f, 0x24, 0x21, 0x01, 0x3b, 0x3c, 0x98, 0x6c, 0xea, 0xcc, 0x1a,
- 0x73, 0xa7, 0x67, 0xf7, 0xa0, 0x8b, 0x05, 0x6b, 0x9f, 0xc8, 0xf0, 0x60, 0x67, 0xbb, 0xa4, 0xb9,
- 0x55, 0x06, 0x7f, 0xf5, 0xa0, 0x83, 0xfc, 0x6b, 0x9f, 0xda, 0x6d, 0x18, 0x20, 0xd5, 0xc8, 0x5c,
- 0xcd, 0xb3, 0xf7, 0xc0, 0x0f, 0xb5, 0x12, 0x46, 0xcd, 0x84, 0x71, 0x55, 0x30, 0xb0, 0x82, 0x43,
- 0xd3, 0x50, 0xce, 0x4b, 0x97, 0x4b, 0xa7, 0xfc, 0xb4, 0x44, 0xe5, 0x3a, 0x97, 0xee, 0x97, 0x5d,
- 0x07, 0x23, 0x09, 0x0e, 0x0d, 0x86, 0xa2, 0x52, 0x31, 0x4f, 0x6c, 0x46, 0x07, 0xdc, 0x71, 0xec,
- 0x5d, 0x18, 0xc4, 0xc5, 0x4c, 0x24, 0x42, 0xaf, 0x28, 0x9d, 0x03, 0xde, 0x8f, 0x8b, 0x43, 0x64,
- 0x51, 0x25, 0x55, 0x32, 0x5b, 0x24, 0x22, 0xa2, 0x8c, 0x0e, 0x78, 0x5f, 0xaa, 0xe4, 0x71, 0x22,
- 0xa2, 0xe0, 0x0c, 0x86, 0x78, 0xc1, 0x53, 0x69, 0x01, 0x0c, 0xa0, 0x83, 0xf1, 0x3b, 0xf8, 0x2e,
- 0xa3, 0x42, 0x3a, 0x76, 0x07, 0x3a, 0x85, 0xac, 0x91, 0x1b, 0x6f, 0x3d, 0x65, 0x4e, 0xaa, 0xe0,
- 0x1f, 0x2d, 0x00, 0x0b, 0x38, 0xa1, 0x77, 0xb9, 0xd6, 0xdf, 0x07, 0xb0, 0x69, 0x98, 0xd9, 0x26,
- 0x85, 0x72, 0xdf, 0x4a, 0x8e, 0x65, 0xc1, 0xde, 0xb1, 0x0d, 0x67, 0x16, 0x4b, 0x07, 0x1b, 0xa1,
- 0x7d, 0x8c, 0x9d, 0xc8, 0x37, 0xf1, 0x4a, 0xcd, 0xf4, 0x3a, 0x51, 0xae, 0x93, 0x34, 0x32, 0x7c,
- 0x24, 0xca, 0x87, 0x26, 0xe1, 0x03, 0x34, 0xe1, 0xeb, 0x44, 0xe1, 0x31, 0x5a, 0x89, 0xd0, 0x58,
- 0x7b, 0x8b, 0xa3, 0x4f, 0x12, 0x52, 0xdf, 0x81, 0x91, 0x55, 0x4b, 0xf5, 0x3c, 0x0e, 0x2d, 0x9c,
- 0x3e, 0x1f, 0x92, 0xec, 0x88, 0x44, 0x5b, 0xc0, 0xf5, 0xb7, 0x80, 0x63, 0xdf, 0x85, 0xa1, 0xcb,
- 0x51, 0x03, 0x56, 0xb0, 0x22, 0x32, 0xd8, 0xe4, 0xc9, 0xdf, 0xca, 0x13, 0x83, 0x4e, 0xd1, 0x78,
- 0x36, 0x48, 0xe3, 0x8d, 0xe3, 0x62, 0xb6, 0x58, 0x27, 0x09, 0xbd, 0x9a, 0x01, 0xef, 0xc5, 0xc5,
- 0xe3, 0x75, 0x92, 0xb0, 0x00, 0xc6, 0x49, 0x9c, 0x2e, 0x67, 0x91, 0xce, 0xd6, 0x39, 0x02, 0x62,
- 0x1f, 0xce, 0x10, 0x85, 0xbf, 0x40, 0xd9, 0xb1, 0x0c, 0xbe, 0x80, 0x1d, 0x87, 0x75, 0xbc, 0x52,
- 0x78, 0xd5, 0x37, 0xea, 0x2d, 0xef, 0x35, 0xb1, 0x74, 0xd5, 0x59, 0x21, 0x17, 0x3c, 0x85, 0x9e,
- 0x45, 0x13, 0x1b, 0xae, 0x14, 0xa5, 0x6b, 0x79, 0x48, 0xb2, 0x03, 0x00, 0xfb, 0x43, 0x91, 0x46,
- 0xca, 0x15, 0x41, 0x73, 0x22, 0xa0, 0x0f, 0x54, 0x71, 0xf2, 0x4f, 0x64, 0xf0, 0x11, 0xf8, 0xb5,
- 0x1c, 0xdf, 0x7a, 0x61, 0x84, 0x36, 0x2e, 0x40, 0xcb, 0xe0, 0x41, 0x2a, 0x95, 0x2e, 0x44, 0x24,
- 0x83, 0x67, 0xd0, 0x3f, 0xc9, 0x92, 0x32, 0xca, 0xd2, 0x37, 0xba, 0xd0, 0x07, 0xd0, 0xcb, 0xb3,
- 0x38, 0x35, 0xc5, 0xb4, 0x4d, 0x31, 0xbd, 0xb5, 0x89, 0xe9, 0x04, 0xe5, 0xdc, 0xa9, 0x83, 0xb0,
- 0xc6, 0x4b, 0x14, 0xcb, 0x43, 0x1d, 0x15, 0xf4, 0x18, 0xab, 0x7a, 0x74, 0xa7, 0x0c, 0xaa, 0x72,
- 0x64, 0x1f, 0x83, 0x4f, 0xd5, 0x28, 0x74, 0x54, 0xd5, 0xfc, 0x3b, 0xdb, 0xef, 0x82, 0x12, 0x81,
- 0x8e, 0xec, 0xe3, 0x47, 0x2a, 0xf8, 0x35, 0x8c, 0xb7, 0x54, 0xcd, 0xa2, 0xf6, 0xb6, 0x8a, 0xfa,
- 0x63, 0x18, 0xda, 0xec, 0x62, 0x26, 0x8a, 0xab, 0x80, 0x92, 0x0b, 0xcc, 0x0a, 0x87, 0xa8, 0x22,
- 0x8b, 0xe0, 0x09, 0xf8, 0xb5, 0x02, 0xcb, 0xb4, 0x2e, 0x10, 0xeb, 0xbc, 0x1f, 0xd9, 0xe2, 0xc0,
- 0x3e, 0xd7, 0xf4, 0xdb, 0x78, 0xd1, 0xe4, 0xd2, 0x2a, 0x83, 0x7f, 0xb6, 0xa0, 0xc3, 0xaf, 0xab,
- 0x9c, 0x7b, 0xb0, 0xe3, 0x90, 0xa9, 0x82, 0xb7, 0x90, 0x8f, 0xc2, 0x1a, 0xc1, 0x63, 0xb9, 0x8d,
- 0x5f, 0xfb, 0x12, 0x7e, 0xef, 0x03, 0xe4, 0x36, 0x8d, 0xa8, 0xb5, 0xad, 0xce, 0x77, 0x92, 0x63,
- 0xc9, 0xfe, 0x9f, 0x96, 0x95, 0x99, 0x9b, 0x5d, 0x58, 0x0e, 0x12, 0x5d, 0x06, 0x30, 0x46, 0xb1,
- 0xd0, 0xd1, 0x4c, 0x24, 0xb1, 0x28, 0xaa, 0xd7, 0x59, 0x48, 0xc4, 0xf7, 0x10, 0x45, 0xd8, 0x7c,
- 0xb3, 0x5c, 0x69, 0x61, 0x32, 0x4d, 0xaf, 0xd3, 0xe7, 0x35, 0xcf, 0xee, 0xc2, 0xb8, 0xa2, 0x67,
- 0x34, 0x43, 0xed, 0x24, 0x1b, 0x55, 0xc2, 0x33, 0x9c, 0xa5, 0x8d, 0x43, 0xec, 0x0e, 0xe1, 0x37,
- 0x0f, 0x79, 0x86, 0xa2, 0x6b, 0x9f, 0x6b, 0x00, 0x63, 0xc4, 0x6d, 0x76, 0x11, 0x9b, 0xf3, 0x59,
- 0xae, 0xab, 0x51, 0x37, 0x44, 0xe1, 0x2f, 0x63, 0x73, 0x7e, 0xa2, 0xb7, 0x73, 0x32, 0xda, 0xca,
- 0x49, 0xf0, 0xc7, 0x16, 0xb4, 0x4f, 0xe5, 0xd5, 0xb6, 0xf8, 0x2e, 0x0c, 0x30, 0x1c, 0x0a, 0xd7,
- 0xc2, 0xdc, 0x2f, 0xe4, 0x92, 0x22, 0x75, 0xaa, 0xc6, 0x42, 0x81, 0xaa, 0xa7, 0x58, 0xf7, 0xf7,
- 0xa0, 0x43, 0xa5, 0x79, 0xa5, 0x1f, 0x9e, 0xd2, 0x2d, 0x38, 0x69, 0xf1, 0x1a, 0x71, 0x98, 0xa5,
- 0x0e, 0x64, 0xa2, 0xf1, 0xc9, 0xad, 0x75, 0xe2, 0x90, 0x45, 0x12, 0x9b, 0x9a, 0x9b, 0x4a, 0xf8,
- 0x76, 0x1d, 0xa8, 0x60, 0x45, 0xf8, 0x80, 0x1b, 0x5d, 0x8f, 0x0c, 0x2c, 0xa8, 0xae, 0xeb, 0x91,
- 0xc1, 0xd6, 0x5c, 0xf3, 0x2f, 0xcd, 0xb5, 0x29, 0xf4, 0x6d, 0x13, 0x94, 0x04, 0xe7, 0x80, 0x57,
- 0xec, 0x56, 0xa3, 0x1d, 0x12, 0xd2, 0xf5, 0x84, 0xfa, 0x83, 0x07, 0x3d, 0x7b, 0x15, 0xec, 0x1c,
- 0xb6, 0x18, 0x5c, 0xe7, 0x20, 0xe6, 0x3f, 0x6e, 0x4e, 0xfe, 0x66, 0x73, 0x5a, 0xad, 0x0b, 0x43,
- 0x25, 0x38, 0xe0, 0x44, 0xa3, 0x6c, 0x9d, 0xc6, 0xd5, 0x90, 0x25, 0x1a, 0x4f, 0xb1, 0xbd, 0xcd,
- 0x02, 0x63, 0x99, 0xba, 0x0e, 0xfa, 0x9b, 0x3a, 0x08, 0xee, 0x42, 0x97, 0x5a, 0x0b, 0x1b, 0x81,
- 0xf7, 0xc2, 0xf5, 0x48, 0xef, 0x05, 0x72, 0xa5, 0x5b, 0x07, 0xbd, 0x32, 0xf8, 0x0a, 0x3a, 0x5c,
- 0x85, 0x74, 0x54, 0xa2, 0x16, 0xc6, 0x99, 0x11, 0x8d, 0x19, 0x30, 0x59, 0xee, 0x6c, 0x91, 0xa4,
- 0xc3, 0x69, 0x29, 0x75, 0x3b, 0x3a, 0x31, 0x38, 0x4b, 0xe6, 0x99, 0x31, 0xd9, 0x8a, 0x82, 0xef,
- 0x72, 0xc7, 0x05, 0x11, 0xf8, 0x8f, 0x45, 0xa8, 0x0e, 0xd3, 0x28, 0xa1, 0xcd, 0xbd, 0x14, 0x17,
- 0x55, 0xab, 0x2e, 0xc5, 0x05, 0x3a, 0xcb, 0x63, 0x13, 0x9e, 0xbb, 0x03, 0x2c, 0x43, 0xbb, 0x5d,
- 0x96, 0x24, 0xd5, 0x56, 0x89, 0x34, 0xdb, 0x05, 0x08, 0xb3, 0x74, 0x11, 0x4b, 0x95, 0x86, 0x8a,
- 0x0e, 0x69, 0xf1, 0x86, 0x24, 0x78, 0x01, 0x70, 0x76, 0xbe, 0x30, 0x5c, 0x15, 0xeb, 0x84, 0xc2,
- 0x89, 0x54, 0x2a, 0x95, 0x76, 0x87, 0x39, 0x0e, 0x23, 0x10, 0x91, 0xaa, 0xae, 0x23, 0x2c, 0x6a,
- 0x5a, 0x84, 0xf5, 0x06, 0x8b, 0x34, 0x5d, 0x46, 0x89, 0xb5, 0x29, 0xeb, 0xcb, 0x10, 0x47, 0x73,
- 0x61, 0x15, 0xbb, 0x49, 0xdd, 0xe5, 0x96, 0x09, 0xfe, 0xd4, 0x82, 0x3e, 0xde, 0xf1, 0x24, 0x2b,
- 0xd8, 0xf7, 0xa1, 0xa7, 0x43, 0x64, 0xae, 0xee, 0x27, 0x08, 0x31, 0x77, 0x5a, 0xdc, 0x13, 0x72,
- 0xf3, 0x44, 0x2d, 0xcc, 0xa3, 0x52, 0xb9, 0x6f, 0x96, 0x2b, 0xd3, 0x60, 0x63, 0xc1, 0x7e, 0x0c,
- 0x90, 0x1b, 0x8e, 0x40, 0xa3, 0x7d, 0xfb, 0x7a, 0xfb, 0x86, 0x09, 0xfb, 0x01, 0xf4, 0x73, 0xf3,
- 0x59, 0xb6, 0x36, 0xe7, 0x74, 0x85, 0x6b, 0xac, 0x2b, 0x3d, 0x4d, 0x25, 0xf3, 0x34, 0x2b, 0xec,
- 0xad, 0xae, 0x9d, 0x4a, 0xa4, 0x66, 0x3f, 0x84, 0xde, 0x82, 0xf2, 0x48, 0x65, 0xb7, 0x35, 0x01,
- 0xea, 0x14, 0x73, 0x67, 0x82, 0x0f, 0xe9, 0x37, 0x6b, 0x91, 0xc4, 0xa6, 0x74, 0xf5, 0x58, 0xb1,
- 0x98, 0xc8, 0x85, 0x08, 0x63, 0x91, 0x1c, 0xe1, 0x37, 0xcc, 0x80, 0xbe, 0x61, 0x1a, 0x92, 0xe0,
- 0xef, 0x2d, 0x18, 0xa0, 0x3f, 0xda, 0xf6, 0xfe, 0x87, 0xe7, 0x7f, 0x8b, 0x27, 0x16, 0xf3, 0x02,
- 0xe1, 0x3c, 0xa2, 0x66, 0xd7, 0xe6, 0x8e, 0x0b, 0xbe, 0x84, 0xfe, 0xe7, 0xf3, 0xaf, 0x09, 0x65,
- 0x1c, 0xc1, 0xe1, 0xe7, 0xf3, 0xaf, 0x5f, 0x03, 0xb2, 0x55, 0x52, 0x2b, 0x28, 0x37, 0xad, 0xa0,
- 0xb4, 0xdf, 0x57, 0x3a, 0x9b, 0x13, 0x80, 0x2d, 0x4e, 0x74, 0xf0, 0x0c, 0x46, 0x27, 0x42, 0x8b,
- 0x55, 0xf5, 0x22, 0xee, 0x42, 0x3b, 0xcf, 0x0a, 0xe7, 0xf9, 0xe6, 0xf6, 0x15, 0x4f, 0xb2, 0x82,
- 0xa3, 0x96, 0xdd, 0x81, 0x76, 0xbc, 0x8a, 0xae, 0x26, 0x8e, 0xbe, 0x8e, 0x39, 0xea, 0x82, 0x9f,
- 0xc3, 0xa4, 0xf6, 0xfb, 0x30, 0x5b, 0xe1, 0x47, 0x2c, 0xbe, 0xc7, 0x85, 0x12, 0xe6, 0x27, 0xe4,
- 0x7d, 0xc4, 0x2d, 0x53, 0x49, 0x0f, 0xc8, 0x9d, 0x93, 0x1e, 0x04, 0x12, 0x6e, 0x6e, 0xe2, 0xd2,
- 0x38, 0x64, 0x4d, 0xc9, 0x3e, 0x84, 0x9e, 0xa6, 0x86, 0xe1, 0xe2, 0xbb, 0xd5, 0x58, 0x9b, 0xea,
- 0x66, 0xc2, 0x9d, 0xcd, 0x9b, 0x44, 0xf9, 0x95, 0xbb, 0xfd, 0xaf, 0xb2, 0x24, 0x43, 0xcc, 0x3e,
- 0x80, 0x6e, 0x9c, 0x2e, 0xe8, 0xfe, 0xed, 0xed, 0xfb, 0x3b, 0xec, 0xb9, 0xd5, 0xbf, 0x89, 0xef,
- 0xdf, 0x79, 0xf0, 0xd6, 0xd1, 0xfc, 0xe1, 0x39, 0x36, 0xfb, 0xea, 0xbf, 0x90, 0x0f, 0xf1, 0x23,
- 0x11, 0x37, 0x78, 0x8c, 0x7f, 0xe7, 0xe0, 0xed, 0xe6, 0xda, 0x37, 0x4f, 0x94, 0x35, 0x96, 0xdc,
- 0x1a, 0xb9, 0x71, 0xde, 0xaa, 0xc7, 0xf9, 0x7d, 0xe8, 0x89, 0xd0, 0xc4, 0x59, 0x4a, 0x19, 0xdc,
- 0x39, 0x60, 0x8d, 0x4f, 0x95, 0xf9, 0x21, 0x69, 0xb8, 0xb3, 0xa0, 0xf1, 0x6c, 0xff, 0x1e, 0xb1,
- 0xe3, 0x39, 0x5d, 0x64, 0xc1, 0xbf, 0x3c, 0x18, 0xdb, 0x45, 0xf5, 0x75, 0x6b, 0xf0, 0xd6, 0xde,
- 0xd5, 0xba, 0xb4, 0x77, 0x5d, 0xf3, 0xff, 0x03, 0xd6, 0xb9, 0xdb, 0xbc, 0xdc, 0x49, 0x15, 0x8b,
- 0x1f, 0x43, 0x46, 0xc7, 0x51, 0xa4, 0xf4, 0x2c, 0x89, 0xd3, 0xea, 0x6b, 0x69, 0xe8, 0x64, 0x4f,
- 0xe2, 0x54, 0xb1, 0xef, 0xc1, 0x8e, 0x8c, 0xb5, 0xa2, 0x80, 0xad, 0x91, 0x1d, 0x90, 0xe3, 0x5a,
- 0x4a, 0x66, 0xd5, 0xe8, 0xed, 0x37, 0x46, 0xef, 0x5d, 0x18, 0x4b, 0xb5, 0xc0, 0x49, 0x32, 0x2b,
- 0x8c, 0x30, 0x76, 0x71, 0xe8, 0xf2, 0x91, 0x13, 0x9e, 0xa2, 0xec, 0xfe, 0x6f, 0x61, 0xd4, 0x84,
- 0x95, 0x8d, 0x60, 0x70, 0x36, 0xb3, 0x00, 0x4c, 0x6e, 0xb0, 0x09, 0x8c, 0x2a, 0x0e, 0xb7, 0xce,
- 0x89, 0xc7, 0x6e, 0xc1, 0xa4, 0x29, 0xc1, 0x2d, 0x7b, 0xd2, 0x62, 0x00, 0xbd, 0xb3, 0x19, 0x59,
- 0xb4, 0xd9, 0x18, 0x7c, 0x4b, 0x9f, 0xca, 0xe5, 0xa4, 0xc3, 0x6e, 0xc2, 0xb8, 0x66, 0x71, 0xdb,
- 0x9d, 0x74, 0x99, 0x0f, 0xdd, 0xb3, 0x19, 0x6a, 0x7b, 0xf7, 0x1f, 0xc0, 0xa0, 0x4a, 0x0b, 0x3a,
- 0x39, 0x4e, 0x0b, 0xa5, 0xcd, 0xe4, 0x06, 0xd2, 0x5f, 0xd2, 0x7e, 0x33, 0xf1, 0x90, 0x3e, 0x52,
- 0x89, 0x32, 0x6a, 0xd2, 0xfa, 0x74, 0xfa, 0xcd, 0xcb, 0x5d, 0xef, 0xdb, 0x97, 0xbb, 0xde, 0xdf,
- 0x5e, 0xee, 0x7a, 0xbf, 0x7f, 0xb5, 0x7b, 0xe3, 0xdb, 0x57, 0xbb, 0x37, 0xfe, 0xf2, 0x6a, 0xf7,
- 0xc6, 0xbc, 0x47, 0x79, 0xfe, 0xe8, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x4a, 0x1d, 0x7d,
- 0xc7, 0x13, 0x00, 0x00,
+ // 2028 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4f, 0x93, 0x1b, 0x47,
+ 0x15, 0xf7, 0x8c, 0xfe, 0xce, 0x93, 0xb4, 0x91, 0x1b, 0x93, 0x28, 0x0e, 0x59, 0xd6, 0x63, 0x43,
+ 0x16, 0x13, 0x4c, 0xb1, 0xc9, 0x21, 0x70, 0xa0, 0x6a, 0xe3, 0xb5, 0xa9, 0xad, 0x72, 0x9c, 0x4d,
+ 0xef, 0x26, 0x14, 0x39, 0xa0, 0x6a, 0x4d, 0xb7, 0x66, 0x27, 0x1a, 0xcd, 0x0c, 0x3d, 0x2d, 0xaf,
+ 0x75, 0xe0, 0xc6, 0x1d, 0x8e, 0x7c, 0x07, 0xbe, 0x48, 0x0e, 0x1c, 0x72, 0xa2, 0xb8, 0x41, 0xd9,
+ 0xc5, 0x05, 0x8a, 0xef, 0x40, 0xbd, 0xd7, 0x3d, 0xa3, 0xd1, 0xee, 0x1a, 0x52, 0xc5, 0x35, 0xb7,
+ 0xf7, 0x4f, 0xdd, 0xef, 0xfd, 0xde, 0xeb, 0xf7, 0xde, 0x08, 0x76, 0x0a, 0x9d, 0x9b, 0x7c, 0x59,
+ 0xc6, 0x0f, 0x88, 0x60, 0xfd, 0x8a, 0x0f, 0x3f, 0x81, 0xe0, 0x4c, 0x94, 0x8b, 0x27, 0x62, 0xa6,
+ 0x52, 0xf6, 0x3a, 0x74, 0x8d, 0x28, 0x17, 0x89, 0x9c, 0x78, 0x7b, 0xde, 0x7e, 0xc0, 0x1d, 0x87,
+ 0xf2, 0x52, 0x2e, 0x12, 0x59, 0x4e, 0xfc, 0xbd, 0x16, 0xca, 0x2d, 0xc7, 0x6e, 0x41, 0x27, 0xc9,
+ 0xa4, 0x7a, 0x3e, 0x69, 0xed, 0x79, 0xfb, 0x1d, 0x6e, 0x99, 0xf0, 0x2f, 0x1e, 0xc0, 0xa9, 0x5c,
+ 0x7c, 0xa4, 0xca, 0x52, 0xc4, 0x8a, 0x8d, 0xa1, 0x15, 0xd5, 0x27, 0x22, 0xc9, 0x7e, 0x04, 0x3d,
+ 0x3c, 0x38, 0x15, 0xb3, 0x89, 0xbf, 0xe7, 0xed, 0x0f, 0x0e, 0xbe, 0xf5, 0xa0, 0xf6, 0xaf, 0x76,
+ 0x86, 0x57, 0x36, 0x8c, 0x41, 0x5b, 0x0a, 0x23, 0xe8, 0x92, 0x21, 0x27, 0x9a, 0x7d, 0x00, 0x5d,
+ 0x55, 0x26, 0xd9, 0x3c, 0x9f, 0xb4, 0xf7, 0x5a, 0xfb, 0x83, 0x83, 0xbd, 0xcd, 0x09, 0x9b, 0xab,
+ 0x1f, 0x3c, 0x22, 0x93, 0x47, 0x99, 0xd1, 0x6b, 0xee, 0xec, 0x6f, 0xff, 0x14, 0x06, 0x0d, 0x31,
+ 0x7a, 0xb7, 0x50, 0xeb, 0xca, 0xbb, 0x85, 0x5a, 0x63, 0x50, 0xcf, 0x44, 0xba, 0x52, 0xe4, 0x5b,
+ 0xc0, 0x2d, 0xf3, 0x33, 0xff, 0x03, 0x2f, 0x3c, 0x86, 0xce, 0xf1, 0x12, 0x43, 0xba, 0x05, 0x9d,
+ 0x8b, 0x44, 0x9a, 0x73, 0xfa, 0x59, 0x87, 0x5b, 0x06, 0x51, 0x3a, 0x57, 0x49, 0x7c, 0x6e, 0xe8,
+ 0x97, 0x1d, 0xee, 0xb8, 0xeb, 0xfc, 0x0f, 0x1f, 0x43, 0xfb, 0x50, 0x2b, 0xc1, 0x76, 0xc0, 0x77,
+ 0xd8, 0x74, 0xb8, 0x9f, 0x48, 0x76, 0x1b, 0xfa, 0x85, 0xd0, 0x2a, 0x33, 0x89, 0x74, 0xa7, 0xd4,
+ 0x3c, 0x9e, 0x93, 0x89, 0xa5, 0xa2, 0x73, 0x02, 0x4e, 0x74, 0xf8, 0xa5, 0x0f, 0xdd, 0x87, 0x62,
+ 0xa9, 0x74, 0xf3, 0xa8, 0x80, 0x8e, 0xaa, 0xcc, 0xfd, 0x8d, 0x39, 0xca, 0xcc, 0xba, 0x50, 0x2e,
+ 0x5f, 0x44, 0xa3, 0x4c, 0x48, 0xa9, 0x27, 0x6d, 0x6b, 0x87, 0x34, 0x86, 0x22, 0xb4, 0x12, 0x89,
+ 0x9c, 0x74, 0x6c, 0x28, 0x96, 0x63, 0xdf, 0x81, 0x20, 0xcd, 0xb3, 0x38, 0x31, 0x2b, 0xa9, 0x26,
+ 0xdd, 0x3d, 0x6f, 0xdf, 0xe7, 0x1b, 0x01, 0x3a, 0x9f, 0x0a, 0x63, 0x95, 0x3d, 0x52, 0xd6, 0x3c,
+ 0xde, 0xa2, 0x4d, 0x59, 0x4c, 0xfa, 0xf6, 0x16, 0xa4, 0xc9, 0xe3, 0x62, 0x12, 0x38, 0x8f, 0x0b,
+ 0xb4, 0x29, 0x72, 0x6d, 0x26, 0x60, 0xbd, 0x43, 0x1a, 0xcf, 0x5c, 0x95, 0x4a, 0x53, 0x24, 0x03,
+ 0xb2, 0xac, 0x79, 0x0b, 0x56, 0x59, 0x5e, 0xe4, 0x5a, 0x4e, 0x86, 0x56, 0x57, 0xf1, 0x98, 0xa2,
+ 0x99, 0x16, 0x99, 0x9c, 0x8c, 0x6c, 0x16, 0x89, 0xc1, 0x5f, 0x68, 0x55, 0x2a, 0xfd, 0x4c, 0xc9,
+ 0xc9, 0x8e, 0xfd, 0x45, 0xc5, 0x87, 0x11, 0xdc, 0xb4, 0x48, 0x1e, 0x66, 0x12, 0xab, 0xf0, 0x38,
+ 0x9b, 0xe7, 0x6c, 0x1f, 0xba, 0x11, 0x09, 0x09, 0xd8, 0xc1, 0xc1, 0x78, 0x53, 0x67, 0xd6, 0x98,
+ 0x3b, 0x3d, 0xbb, 0x07, 0x1d, 0x2c, 0x58, 0xfb, 0x44, 0x06, 0x07, 0x3b, 0xdb, 0x25, 0xcd, 0xad,
+ 0x32, 0xfc, 0x9b, 0x07, 0x6d, 0xe4, 0x5f, 0xf9, 0xd4, 0x6e, 0x43, 0x1f, 0xa9, 0x46, 0xe6, 0x6a,
+ 0x9e, 0xbd, 0x05, 0x41, 0xa4, 0x95, 0x30, 0x6a, 0x2a, 0x8c, 0xab, 0x82, 0xbe, 0x15, 0x1c, 0x9a,
+ 0x86, 0x72, 0xb6, 0x76, 0xb9, 0x74, 0xca, 0x0f, 0xd7, 0xa8, 0x5c, 0x15, 0xd2, 0xfd, 0xb2, 0xe3,
+ 0x60, 0x24, 0xc1, 0xa1, 0x41, 0x57, 0x54, 0x26, 0x66, 0xa9, 0xcd, 0x68, 0x9f, 0x3b, 0x8e, 0xbd,
+ 0x09, 0xfd, 0xa4, 0x9c, 0x8a, 0x54, 0xe8, 0x25, 0xa5, 0xb3, 0xcf, 0x7b, 0x49, 0x79, 0x88, 0x2c,
+ 0xaa, 0xa4, 0x4a, 0xa7, 0xf3, 0x54, 0xc4, 0x94, 0xd1, 0x3e, 0xef, 0x49, 0x95, 0x3e, 0x4e, 0x45,
+ 0x1c, 0x9e, 0xc1, 0x00, 0x03, 0x3c, 0x95, 0x16, 0xc0, 0x10, 0xda, 0xe8, 0xbf, 0x83, 0xef, 0x32,
+ 0x2a, 0xa4, 0x63, 0x77, 0xa0, 0x5d, 0xca, 0x1a, 0xb9, 0xd1, 0xd6, 0x53, 0xe6, 0xa4, 0x0a, 0xff,
+ 0xe9, 0x03, 0x58, 0xc0, 0x09, 0xbd, 0xcb, 0xb5, 0xfe, 0x36, 0x80, 0x4d, 0xc3, 0xd4, 0x36, 0x29,
+ 0x94, 0x07, 0x56, 0x72, 0x2c, 0x4b, 0xf6, 0x86, 0x6d, 0x38, 0xd3, 0x44, 0x3a, 0xd8, 0x08, 0xed,
+ 0x63, 0xec, 0x44, 0x81, 0x49, 0x96, 0x6a, 0xaa, 0x57, 0xa9, 0x72, 0x9d, 0xa4, 0x91, 0xe1, 0x23,
+ 0xb1, 0x7e, 0x68, 0x52, 0xde, 0x47, 0x13, 0xbe, 0x4a, 0x15, 0x5e, 0xa3, 0x95, 0x88, 0x8c, 0xb5,
+ 0xb7, 0x38, 0x06, 0x24, 0x21, 0xf5, 0x1d, 0x18, 0x5a, 0xb5, 0x54, 0xcf, 0x92, 0xc8, 0xc2, 0x19,
+ 0xf0, 0x01, 0xc9, 0x8e, 0x48, 0xb4, 0x05, 0x5c, 0x6f, 0x0b, 0x38, 0xf6, 0x5d, 0x18, 0xb8, 0x1c,
+ 0x35, 0x60, 0x05, 0x2b, 0x22, 0x83, 0x4d, 0x9e, 0x82, 0xad, 0x3c, 0x31, 0x68, 0x97, 0x8d, 0x67,
+ 0x83, 0x34, 0x46, 0x9c, 0x94, 0xd3, 0xf9, 0x2a, 0x4d, 0xe9, 0xd5, 0xf4, 0x79, 0x37, 0x29, 0x1f,
+ 0xaf, 0xd2, 0x94, 0x85, 0x30, 0x4a, 0x93, 0x6c, 0x31, 0x8d, 0x75, 0xbe, 0x2a, 0x10, 0x10, 0xfb,
+ 0x70, 0x06, 0x28, 0xfc, 0x05, 0xca, 0x8e, 0x65, 0xf8, 0x09, 0xec, 0x38, 0xac, 0x93, 0xa5, 0xc2,
+ 0x50, 0xbf, 0x56, 0x6f, 0x79, 0xab, 0x89, 0xa5, 0xab, 0xce, 0x0a, 0xb9, 0xf0, 0x29, 0x74, 0x2d,
+ 0x9a, 0xd8, 0x70, 0xa5, 0x58, 0xbb, 0x96, 0x87, 0x24, 0x3b, 0x00, 0xb0, 0x3f, 0x14, 0x59, 0xac,
+ 0x5c, 0x11, 0x34, 0x27, 0x02, 0x9e, 0x81, 0x2a, 0x4e, 0xe7, 0x13, 0x19, 0xbe, 0x07, 0x41, 0x2d,
+ 0xc7, 0xb7, 0x5e, 0x1a, 0xa1, 0x8d, 0x73, 0xd0, 0x32, 0x78, 0x91, 0xca, 0xa4, 0x73, 0x11, 0xc9,
+ 0xf0, 0x33, 0xe8, 0x9d, 0xe4, 0xe9, 0x3a, 0xce, 0xb3, 0xaf, 0x15, 0xd0, 0x3b, 0xd0, 0x2d, 0xf2,
+ 0x24, 0x33, 0xe5, 0xa4, 0x45, 0x3e, 0xbd, 0xb6, 0xf1, 0xe9, 0x04, 0xe5, 0xdc, 0xa9, 0xc3, 0xa8,
+ 0xc6, 0x4b, 0x94, 0x8b, 0x43, 0x1d, 0x97, 0xf4, 0x18, 0xab, 0x7a, 0x74, 0xb7, 0xf4, 0xab, 0x72,
+ 0x64, 0xef, 0x43, 0x40, 0xd5, 0x28, 0x74, 0x5c, 0xd5, 0xfc, 0x1b, 0xdb, 0xef, 0x82, 0x12, 0x81,
+ 0x07, 0xd9, 0xc7, 0x8f, 0x54, 0xf8, 0x6b, 0x18, 0x6d, 0xa9, 0x9a, 0x45, 0xed, 0x6d, 0x15, 0xf5,
+ 0xfb, 0x30, 0xb0, 0xd9, 0xc5, 0x4c, 0x94, 0x57, 0x01, 0xa5, 0x23, 0x30, 0x2b, 0x1c, 0xe2, 0x8a,
+ 0x2c, 0xc3, 0x27, 0x10, 0xd4, 0x0a, 0x2c, 0xd3, 0xba, 0x40, 0xec, 0xe1, 0xbd, 0xd8, 0x16, 0x07,
+ 0xf6, 0xb9, 0xe6, 0xb9, 0x8d, 0x17, 0x4d, 0x47, 0x5a, 0x65, 0xf8, 0x2f, 0x1f, 0xda, 0xfc, 0xba,
+ 0xca, 0xb9, 0x07, 0x3b, 0x0e, 0x99, 0xca, 0x79, 0x0b, 0xf9, 0x30, 0xaa, 0x11, 0x3c, 0x96, 0xdb,
+ 0xf8, 0xb5, 0x2e, 0xe1, 0xf7, 0x36, 0x40, 0x61, 0xd3, 0x88, 0x5a, 0xdb, 0xea, 0x02, 0x27, 0x39,
+ 0x96, 0xec, 0xdb, 0xb4, 0xac, 0x4c, 0xdd, 0xec, 0xc2, 0x72, 0x90, 0x78, 0x64, 0x08, 0x23, 0x14,
+ 0x0b, 0x1d, 0x4f, 0x45, 0x9a, 0x88, 0xb2, 0x7a, 0x9d, 0xa5, 0x44, 0x7c, 0x0f, 0x51, 0x84, 0xcd,
+ 0x37, 0x2f, 0x94, 0x16, 0x26, 0xd7, 0xf4, 0x3a, 0x03, 0x5e, 0xf3, 0xec, 0x2e, 0x8c, 0x2a, 0x7a,
+ 0x4a, 0x33, 0xd4, 0x4e, 0xb2, 0x61, 0x25, 0x3c, 0xc3, 0x59, 0xda, 0xb8, 0xc4, 0xee, 0x10, 0x41,
+ 0xf3, 0x92, 0xcf, 0x50, 0x74, 0xed, 0x73, 0x0d, 0x61, 0x84, 0xb8, 0x4d, 0x2f, 0x12, 0x73, 0x3e,
+ 0x2d, 0x74, 0x35, 0xea, 0x06, 0x28, 0xfc, 0x65, 0x62, 0xce, 0x4f, 0xf4, 0x76, 0x4e, 0x86, 0x5b,
+ 0x39, 0x09, 0xff, 0xe4, 0x43, 0xeb, 0x54, 0x5e, 0x6d, 0x8b, 0x6f, 0x42, 0x1f, 0xdd, 0x21, 0x77,
+ 0x2d, 0xcc, 0xbd, 0x52, 0x2e, 0xc8, 0x53, 0xa7, 0x6a, 0x2c, 0x14, 0xa8, 0x7a, 0x8a, 0x75, 0x7f,
+ 0x0f, 0xda, 0x54, 0x9a, 0x57, 0xfa, 0xe1, 0x29, 0x45, 0xc1, 0x49, 0x8b, 0x61, 0x24, 0x51, 0x9e,
+ 0x39, 0x90, 0x89, 0xc6, 0x27, 0xb7, 0xd2, 0xa9, 0x43, 0x16, 0x49, 0x6c, 0x6a, 0x6e, 0x2a, 0xe1,
+ 0xdb, 0x75, 0xa0, 0x82, 0x15, 0xe1, 0x03, 0x6e, 0x74, 0x3d, 0x32, 0xb0, 0xa0, 0xba, 0xae, 0x47,
+ 0x06, 0x5b, 0x73, 0x2d, 0xb8, 0x34, 0xd7, 0x26, 0xd0, 0xb3, 0x4d, 0x50, 0x12, 0x9c, 0x7d, 0x5e,
+ 0xb1, 0x5b, 0x8d, 0x76, 0x40, 0x48, 0xd7, 0x13, 0xea, 0x8f, 0x1e, 0x74, 0x6d, 0x28, 0xd8, 0x39,
+ 0x6c, 0x31, 0xb8, 0xce, 0x41, 0xcc, 0xff, 0xdc, 0x9c, 0x82, 0xcd, 0xe6, 0xb4, 0x5c, 0x95, 0x86,
+ 0x4a, 0xb0, 0xcf, 0x89, 0x46, 0xd9, 0x2a, 0x4b, 0xaa, 0x21, 0x4b, 0x34, 0xde, 0x62, 0x7b, 0x9b,
+ 0x05, 0xc6, 0x32, 0x75, 0x1d, 0xf4, 0x36, 0x75, 0x10, 0xde, 0x85, 0x0e, 0xb5, 0x16, 0x36, 0x04,
+ 0xef, 0xb9, 0xeb, 0x91, 0xde, 0x73, 0xe4, 0xd6, 0x6e, 0x1d, 0xf4, 0xd6, 0xe1, 0xe7, 0xd0, 0xe6,
+ 0x2a, 0xa2, 0xab, 0x52, 0x35, 0x37, 0xce, 0x8c, 0x68, 0xcc, 0x80, 0xc9, 0x0b, 0x67, 0x8b, 0x24,
+ 0x5d, 0x4e, 0x4b, 0xa9, 0xdb, 0xd1, 0x89, 0xc1, 0x59, 0x32, 0xcb, 0x8d, 0xc9, 0x97, 0xe4, 0x7c,
+ 0x87, 0x3b, 0x2e, 0x8c, 0x21, 0x78, 0x2c, 0x22, 0x75, 0x98, 0xc5, 0x29, 0x6d, 0xee, 0x6b, 0x71,
+ 0x51, 0xb5, 0xea, 0xb5, 0xb8, 0xc0, 0xc3, 0x8a, 0xc4, 0x44, 0xe7, 0xee, 0x02, 0xcb, 0xd0, 0x6e,
+ 0x97, 0xa7, 0x69, 0xb5, 0x55, 0x22, 0xcd, 0x76, 0x01, 0xa2, 0x3c, 0x9b, 0x27, 0x52, 0x65, 0x91,
+ 0xa2, 0x4b, 0x7c, 0xde, 0x90, 0x84, 0xcf, 0x01, 0xce, 0xce, 0xe7, 0x86, 0xab, 0x72, 0x95, 0x92,
+ 0x3b, 0xb1, 0xca, 0xa4, 0xd2, 0xee, 0x32, 0xc7, 0xa1, 0x07, 0x22, 0x56, 0x55, 0x38, 0xc2, 0xa2,
+ 0xa6, 0x45, 0x54, 0x6f, 0xb0, 0x48, 0x53, 0x30, 0x4a, 0xac, 0xcc, 0xba, 0x0e, 0x86, 0x38, 0x9a,
+ 0x0b, 0xcb, 0xc4, 0x4d, 0xea, 0x0e, 0xb7, 0x4c, 0xf8, 0x67, 0x1f, 0x7a, 0x18, 0xe3, 0x49, 0x5e,
+ 0xb2, 0xef, 0x43, 0x57, 0x47, 0xc8, 0x5c, 0xdd, 0x4f, 0x10, 0x62, 0xee, 0xb4, 0xb8, 0x27, 0x14,
+ 0xe6, 0x89, 0x9a, 0x9b, 0x47, 0x6b, 0xe5, 0xbe, 0x59, 0xae, 0x4c, 0x83, 0x8d, 0x05, 0xfb, 0x31,
+ 0x40, 0x61, 0x38, 0x02, 0x8d, 0xf6, 0xad, 0xeb, 0xed, 0x1b, 0x26, 0xec, 0x07, 0xd0, 0x2b, 0xcc,
+ 0x47, 0xf9, 0xca, 0x9c, 0x53, 0x08, 0xd7, 0x58, 0x57, 0x7a, 0x9a, 0x4a, 0xe6, 0x69, 0x5e, 0xda,
+ 0xa8, 0xae, 0x9d, 0x4a, 0xa4, 0x66, 0x3f, 0x84, 0xee, 0x9c, 0xf2, 0x48, 0x65, 0xb7, 0x35, 0x01,
+ 0xea, 0x14, 0x73, 0x67, 0x82, 0x0f, 0xe9, 0x37, 0x2b, 0x91, 0x26, 0x66, 0xed, 0xea, 0xb1, 0x62,
+ 0x31, 0x91, 0x73, 0x11, 0x25, 0x22, 0x3d, 0xc2, 0x6f, 0x98, 0x3e, 0x7d, 0xc3, 0x34, 0x24, 0xe1,
+ 0x3f, 0x7c, 0xe8, 0xe3, 0x79, 0xb4, 0xed, 0x7d, 0x83, 0xe7, 0xff, 0x8b, 0x27, 0x16, 0xf3, 0x1c,
+ 0xe1, 0x3c, 0xa2, 0x66, 0xd7, 0xe2, 0x8e, 0x0b, 0x3f, 0x85, 0xde, 0xc7, 0xb3, 0x2f, 0x08, 0x65,
+ 0x1c, 0xc1, 0xd1, 0xc7, 0xb3, 0x2f, 0x5e, 0x01, 0xb2, 0x55, 0x52, 0x2b, 0x58, 0x6f, 0x5a, 0xc1,
+ 0xda, 0x7e, 0x5f, 0xe9, 0x7c, 0x46, 0x00, 0xfa, 0x9c, 0xe8, 0xf0, 0x77, 0x1e, 0x0c, 0x4f, 0x84,
+ 0x16, 0xcb, 0xea, 0x49, 0xdc, 0x85, 0x56, 0x91, 0x97, 0xee, 0xe8, 0x9b, 0xdb, 0x31, 0x9e, 0xe4,
+ 0x25, 0x47, 0x2d, 0x7b, 0x17, 0xba, 0x9a, 0x5e, 0xae, 0x4b, 0xde, 0xad, 0xc6, 0xfe, 0x52, 0xbf,
+ 0x6a, 0xee, 0x6c, 0xd8, 0x1d, 0x68, 0x25, 0xcb, 0xf8, 0x6a, 0xde, 0xe8, 0x63, 0x9a, 0xa3, 0x2e,
+ 0xfc, 0x39, 0x8c, 0x6b, 0x2f, 0x1e, 0xe6, 0x4b, 0xfc, 0xe6, 0xc5, 0xe7, 0x3b, 0x57, 0xc2, 0xfc,
+ 0x84, 0x7c, 0x19, 0x72, 0xcb, 0x54, 0xd2, 0x03, 0xba, 0xd9, 0x49, 0x0f, 0xc2, 0xcf, 0x5d, 0x14,
+ 0xbf, 0xca, 0xd3, 0x1c, 0x83, 0x7f, 0x07, 0x3a, 0xf8, 0x8d, 0x8f, 0x71, 0xb4, 0xb6, 0xe3, 0x70,
+ 0x20, 0x72, 0xab, 0xaf, 0x7c, 0xf3, 0xff, 0x8b, 0x6f, 0xbf, 0xf7, 0xe0, 0xb5, 0xa3, 0xd9, 0xc3,
+ 0x73, 0xec, 0xda, 0xd5, 0x9f, 0x1a, 0xef, 0xe2, 0xd7, 0x1e, 0xae, 0xe2, 0xe8, 0xdb, 0xce, 0xc1,
+ 0xeb, 0xcd, 0xfd, 0x6d, 0x96, 0x2a, 0x6b, 0x2c, 0xb9, 0x35, 0x72, 0x73, 0xd9, 0xaf, 0xe7, 0xf2,
+ 0x7d, 0xe8, 0x8a, 0xc8, 0x24, 0x79, 0x46, 0x98, 0xec, 0x1c, 0xb0, 0xc6, 0x37, 0xc7, 0xec, 0x90,
+ 0x34, 0xdc, 0x59, 0xd0, 0x9c, 0xb5, 0xff, 0x73, 0xd8, 0x39, 0x9b, 0xcd, 0xf3, 0xf0, 0xdf, 0x1e,
+ 0x8c, 0xec, 0xc6, 0xf9, 0xaa, 0x7d, 0x76, 0x6b, 0x81, 0xf2, 0x2f, 0x2d, 0x50, 0xd7, 0xfc, 0x91,
+ 0x80, 0x05, 0xeb, 0x56, 0x28, 0x77, 0x53, 0xc5, 0xe2, 0x57, 0x8d, 0xd1, 0x49, 0x1c, 0x2b, 0x3d,
+ 0x4d, 0x93, 0xac, 0xfa, 0xec, 0x19, 0x38, 0xd9, 0x93, 0x24, 0x53, 0xec, 0x7b, 0xb0, 0x23, 0x13,
+ 0xad, 0xc8, 0x61, 0x6b, 0x64, 0x27, 0xdd, 0xa8, 0x96, 0x92, 0x59, 0x35, 0x43, 0x7b, 0x8d, 0x19,
+ 0x7a, 0x17, 0x46, 0x52, 0xcd, 0x71, 0x24, 0x4c, 0x4b, 0x23, 0x8c, 0xdd, 0x00, 0x3a, 0x7c, 0xe8,
+ 0x84, 0xa7, 0x28, 0xbb, 0xff, 0x5b, 0x18, 0x36, 0x61, 0x65, 0x43, 0xe8, 0x9f, 0x4d, 0x2d, 0x00,
+ 0xe3, 0x1b, 0x6c, 0x0c, 0xc3, 0x8a, 0xc3, 0xf5, 0x71, 0xec, 0xb1, 0x5b, 0x30, 0x6e, 0x4a, 0x70,
+ 0x5d, 0x1e, 0xfb, 0x0c, 0xa0, 0x7b, 0x36, 0x25, 0x8b, 0x16, 0x1b, 0x41, 0x60, 0xe9, 0x53, 0xb9,
+ 0x18, 0xb7, 0xd9, 0x4d, 0x18, 0xd5, 0x2c, 0xae, 0xad, 0xe3, 0x0e, 0x0b, 0xa0, 0x73, 0x36, 0x45,
+ 0x6d, 0xf7, 0xfe, 0x03, 0xe8, 0x57, 0x69, 0xc1, 0x43, 0x8e, 0xb3, 0x52, 0x69, 0x33, 0xbe, 0x81,
+ 0xf4, 0xa7, 0xb4, 0xa8, 0x8c, 0x3d, 0xa4, 0x8f, 0x54, 0xaa, 0x8c, 0x1a, 0xfb, 0x1f, 0x4e, 0xbe,
+ 0x7c, 0xb1, 0xeb, 0x7d, 0xf5, 0x62, 0xd7, 0xfb, 0xfb, 0x8b, 0x5d, 0xef, 0x0f, 0x2f, 0x77, 0x6f,
+ 0x7c, 0xf5, 0x72, 0xf7, 0xc6, 0x5f, 0x5f, 0xee, 0xde, 0x98, 0x75, 0x29, 0xcf, 0xef, 0xfd, 0x27,
+ 0x00, 0x00, 0xff, 0xff, 0x71, 0x02, 0x5d, 0x37, 0x90, 0x13, 0x00, 0x00,
}
func (m *TaskLabel) Marshal() (dAtA []byte, err error) {
@@ -4078,15 +4031,25 @@
}
i += n17
}
- if m.Img != nil {
+ if m.Result != nil {
dAtA[i] = 0x12
i++
- i = encodeVarintProtomsg(dAtA, i, uint64(m.Img.Size()))
- n18, err18 := m.Img.MarshalTo(dAtA[i:])
+ i = encodeVarintProtomsg(dAtA, i, uint64(m.Result.Size()))
+ n18, err18 := m.Result.MarshalTo(dAtA[i:])
if err18 != nil {
return 0, err18
}
i += n18
+ }
+ if m.Img != nil {
+ dAtA[i] = 0x1a
+ i++
+ i = encodeVarintProtomsg(dAtA, i, uint64(m.Img.Size()))
+ n19, err19 := m.Img.MarshalTo(dAtA[i:])
+ if err19 != nil {
+ return 0, err19
+ }
+ i += n19
}
return i, nil
}
@@ -4117,44 +4080,6 @@
i++
i = encodeVarintProtomsg(dAtA, i, uint64(len(m.Feat2)))
i += copy(dAtA[i:], m.Feat2)
- }
- return i, nil
-}
-
-func (m *ParamFaceProperty) 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 *ParamFaceProperty) MarshalTo(dAtA []byte) (int, error) {
- var i int
- _ = i
- var l int
- _ = l
- if m.Result != nil {
- dAtA[i] = 0xa
- i++
- i = encodeVarintProtomsg(dAtA, i, uint64(m.Result.Size()))
- n19, err19 := m.Result.MarshalTo(dAtA[i:])
- if err19 != nil {
- return 0, err19
- }
- i += n19
- }
- if m.Img != nil {
- dAtA[i] = 0x12
- i++
- i = encodeVarintProtomsg(dAtA, i, uint64(m.Img.Size()))
- n20, err20 := m.Img.MarshalTo(dAtA[i:])
- if err20 != nil {
- return 0, err20
- }
- i += n20
}
return i, nil
}
@@ -4190,11 +4115,11 @@
dAtA[i] = 0x12
i++
i = encodeVarintProtomsg(dAtA, i, uint64(m.Img.Size()))
- n21, err21 := m.Img.MarshalTo(dAtA[i:])
- if err21 != nil {
- return 0, err21
+ n20, err20 := m.Img.MarshalTo(dAtA[i:])
+ if err20 != nil {
+ return 0, err20
}
- i += n21
+ i += n20
}
return i, nil
}
@@ -5065,6 +4990,10 @@
l = m.Pos.Size()
n += 1 + l + sovProtomsg(uint64(l))
}
+ if m.Result != nil {
+ l = m.Result.Size()
+ n += 1 + l + sovProtomsg(uint64(l))
+ }
if m.Img != nil {
l = m.Img.Size()
n += 1 + l + sovProtomsg(uint64(l))
@@ -5084,23 +5013,6 @@
}
l = len(m.Feat2)
if l > 0 {
- n += 1 + l + sovProtomsg(uint64(l))
- }
- return n
-}
-
-func (m *ParamFaceProperty) Size() (n int) {
- if m == nil {
- return 0
- }
- var l int
- _ = l
- if m.Result != nil {
- l = m.Result.Size()
- n += 1 + l + sovProtomsg(uint64(l))
- }
- if m.Img != nil {
- l = m.Img.Size()
n += 1 + l + sovProtomsg(uint64(l))
}
return n
@@ -10460,6 +10372,42 @@
iNdEx = postIndex
case 2:
if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowProtomsg
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthProtomsg
+ }
+ postIndex := iNdEx + msglen
+ if postIndex < 0 {
+ return ErrInvalidLengthProtomsg
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ if m.Result == nil {
+ m.Result = &ThftResult{}
+ }
+ if err := m.Result.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
+ case 3:
+ if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Img", wireType)
}
var msglen int
@@ -10613,131 +10561,6 @@
m.Feat2 = append(m.Feat2[:0], dAtA[iNdEx:postIndex]...)
if m.Feat2 == nil {
m.Feat2 = []byte{}
- }
- iNdEx = postIndex
- default:
- iNdEx = preIndex
- skippy, err := skipProtomsg(dAtA[iNdEx:])
- if err != nil {
- return err
- }
- if skippy < 0 {
- return ErrInvalidLengthProtomsg
- }
- if (iNdEx + skippy) < 0 {
- return ErrInvalidLengthProtomsg
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func (m *ParamFaceProperty) Unmarshal(dAtA []byte) error {
- l := len(dAtA)
- iNdEx := 0
- for iNdEx < l {
- preIndex := iNdEx
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowProtomsg
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- wire |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- fieldNum := int32(wire >> 3)
- wireType := int(wire & 0x7)
- if wireType == 4 {
- return fmt.Errorf("proto: ParamFaceProperty: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: ParamFaceProperty: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType)
- }
- var msglen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowProtomsg
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- msglen |= int(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if msglen < 0 {
- return ErrInvalidLengthProtomsg
- }
- postIndex := iNdEx + msglen
- if postIndex < 0 {
- return ErrInvalidLengthProtomsg
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- if m.Result == nil {
- m.Result = &ThftResult{}
- }
- if err := m.Result.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
- return err
- }
- iNdEx = postIndex
- case 2:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Img", wireType)
- }
- var msglen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowProtomsg
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- msglen |= int(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if msglen < 0 {
- return ErrInvalidLengthProtomsg
- }
- postIndex := iNdEx + msglen
- if postIndex < 0 {
- return ErrInvalidLengthProtomsg
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- if m.Img == nil {
- m.Img = &Image{}
- }
- if err := m.Img.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
- return err
}
iNdEx = postIndex
default:
diff --git a/protomsg.proto b/protomsg.proto
index 2a8311b..c9146c2 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -221,19 +221,16 @@
// sdk face property
message ParamFacePos{
- FacePos pos = 1;
- Image img = 2;
+ FacePos pos = 1;
+ ThftResult result = 2;
+ Image img = 3;
}
// sdk face extract
message ParamFaceCompare{
bytes feat1 = 1;
bytes feat2 = 2;
}
-// sdk face property
-message ParamFaceProperty{
- ThftResult result = 1;
- Image img = 2;
-}
+
// sdk yolo detect
message ParamYoloObj{
repeated ObjInfo infos = 1;
--
Gitblit v1.8.0