From ce8c0f2b14dd1c657b6904415f0266d05372531f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 24 五月 2019 15:20:49 +0800
Subject: [PATCH] add yolo obj

---
 protomsg.pb.go |  717 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 594 insertions(+), 123 deletions(-)

diff --git a/protomsg.pb.go b/protomsg.pb.go
index fd9f9cf..bfcda93 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -1797,8 +1797,8 @@
 
 // sdk face property
 type ParamFacePos struct {
-	Pos []*FacePos `protobuf:"bytes,1,rep,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"`
+	Img *Image   `protobuf:"bytes,2,opt,name=img,proto3" json:"img,omitempty"`
 }
 
 func (m *ParamFacePos) Reset()         { *m = ParamFacePos{} }
@@ -1834,7 +1834,7 @@
 
 var xxx_messageInfo_ParamFacePos proto.InternalMessageInfo
 
-func (m *ParamFacePos) GetPos() []*FacePos {
+func (m *ParamFacePos) GetPos() *FacePos {
 	if m != nil {
 		return m.Pos
 	}
@@ -1901,6 +1901,112 @@
 	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{24}
+}
+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"`
+	Img   *Image     `protobuf:"bytes,2,opt,name=img,proto3" json:"img,omitempty"`
+}
+
+func (m *ParamYoloObj) Reset()         { *m = ParamYoloObj{} }
+func (m *ParamYoloObj) String() string { return proto.CompactTextString(m) }
+func (*ParamYoloObj) ProtoMessage()    {}
+func (*ParamYoloObj) Descriptor() ([]byte, []int) {
+	return fileDescriptor_32de24555f916688, []int{25}
+}
+func (m *ParamYoloObj) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ParamYoloObj) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_ParamYoloObj.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 *ParamYoloObj) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ParamYoloObj.Merge(m, src)
+}
+func (m *ParamYoloObj) XXX_Size() int {
+	return m.Size()
+}
+func (m *ParamYoloObj) XXX_DiscardUnknown() {
+	xxx_messageInfo_ParamYoloObj.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ParamYoloObj proto.InternalMessageInfo
+
+func (m *ParamYoloObj) GetInfos() []*ObjInfo {
+	if m != nil {
+		return m.Infos
+	}
+	return nil
+}
+
+func (m *ParamYoloObj) GetImg() *Image {
+	if m != nil {
+		return m.Img
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*TaskLabel)(nil), "protomsg.TaskLabel")
 	proto.RegisterType((*SdkMessage)(nil), "protomsg.SdkMessage")
@@ -1926,110 +2032,115 @@
 	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")
 }
 
 func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
 
 var fileDescriptor_32de24555f916688 = []byte{
-	// 1561 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0xaf, 0xff, 0x7b, 0x9f, 0x9d, 0xd0, 0x2e, 0x05, 0xb6, 0x05, 0x42, 0xba, 0x8d, 0x20, 0x08,
-	0x51, 0x44, 0x7a, 0x47, 0x72, 0x1b, 0x82, 0x2c, 0xb5, 0x69, 0x98, 0x84, 0x22, 0x71, 0xb1, 0xc6,
-	0x3b, 0xe3, 0xf5, 0x36, 0xeb, 0xdd, 0x65, 0x66, 0xdc, 0xc4, 0x77, 0x3e, 0x00, 0xdf, 0x83, 0x2f,
-	0xd2, 0x03, 0x87, 0x1e, 0xb9, 0x81, 0x5a, 0x71, 0xe1, 0x0b, 0x70, 0x45, 0xef, 0xcd, 0xec, 0xda,
-	0x4e, 0x52, 0x09, 0x89, 0x2b, 0xb7, 0xf7, 0x7b, 0xef, 0xf9, 0xcd, 0x9b, 0xdf, 0xfb, 0xb3, 0x63,
-	0xd8, 0x2c, 0x54, 0x6e, 0xf2, 0x99, 0x8e, 0xef, 0x91, 0xe0, 0x77, 0x4b, 0x1c, 0x7e, 0x0b, 0xde,
-	0x09, 0xd7, 0xa7, 0x8f, 0xf8, 0x58, 0xa6, 0xfe, 0xbb, 0xd0, 0x36, 0x5c, 0x9f, 0x26, 0x22, 0xa8,
-	0x6d, 0xd7, 0x76, 0x3d, 0xe6, 0x10, 0xea, 0xb5, 0x38, 0x4d, 0x84, 0x0e, 0xea, 0xdb, 0x0d, 0xd4,
-	0x5b, 0xe4, 0xdf, 0x84, 0x56, 0x92, 0x09, 0x79, 0x1e, 0x34, 0xb6, 0x6b, 0xbb, 0x2d, 0x66, 0x41,
-	0xc8, 0x01, 0x8e, 0xc5, 0xe9, 0x63, 0xa9, 0x35, 0x8f, 0xa5, 0x7f, 0x1d, 0x1a, 0x51, 0x15, 0x10,
-	0x45, 0xff, 0x73, 0xe8, 0x60, 0xdc, 0x94, 0x8f, 0x83, 0xfa, 0x76, 0x6d, 0xb7, 0xb7, 0xf7, 0xf6,
-	0xbd, 0x2a, 0xbd, 0x2a, 0x17, 0x56, 0xfa, 0xf8, 0x3e, 0x34, 0x05, 0x37, 0x9c, 0xce, 0xe8, 0x33,
-	0x92, 0xc3, 0x21, 0xb4, 0x86, 0x33, 0x8c, 0x7e, 0x13, 0x5a, 0x67, 0x89, 0x30, 0x53, 0x8a, 0xdf,
-	0x62, 0x16, 0x60, 0xbe, 0x53, 0x99, 0xc4, 0x53, 0x43, 0x07, 0xb4, 0x98, 0x43, 0x57, 0x86, 0x3a,
-	0x80, 0xe6, 0x40, 0x49, 0xee, 0x6f, 0x42, 0xdd, 0xa5, 0xd9, 0x62, 0xf5, 0x44, 0xf8, 0xb7, 0xa1,
-	0x5b, 0x70, 0x25, 0x33, 0x93, 0x08, 0x17, 0xa5, 0xc2, 0x18, 0x27, 0xe3, 0x33, 0x49, 0x71, 0x3c,
-	0x46, 0x72, 0xf8, 0xa2, 0x0e, 0xed, 0x87, 0x7c, 0x26, 0xd5, 0x6a, 0x28, 0x8f, 0x42, 0x95, 0xee,
-	0xf5, 0xa5, 0x3b, 0xea, 0xcc, 0xa2, 0x90, 0x8e, 0x39, 0x92, 0x51, 0xc7, 0x85, 0x50, 0x41, 0xd3,
-	0xfa, 0xa1, 0x8c, 0x57, 0xe1, 0x4a, 0xf2, 0x44, 0x04, 0x2d, 0x7b, 0x15, 0x8b, 0xfc, 0x0f, 0xc0,
-	0x4b, 0xf3, 0x2c, 0x4e, 0xcc, 0x5c, 0xc8, 0xa0, 0xbd, 0x5d, 0xdb, 0xad, 0xb3, 0xa5, 0x02, 0x93,
-	0x4f, 0xb9, 0xb1, 0xc6, 0x0e, 0x19, 0x2b, 0x8c, 0xa7, 0x28, 0xa3, 0x8b, 0xa0, 0x6b, 0x4f, 0x41,
-	0x99, 0x32, 0x2e, 0x02, 0xcf, 0x65, 0x5c, 0xa0, 0x4f, 0x91, 0x2b, 0x13, 0x80, 0xcd, 0x0e, 0x65,
-	0x8c, 0x39, 0xd7, 0x52, 0xd1, 0x4d, 0x7a, 0xe4, 0x59, 0x61, 0x4b, 0x96, 0xd6, 0x67, 0xb9, 0x12,
-	0x41, 0xdf, 0xda, 0x4a, 0x8c, 0x25, 0x1a, 0x2b, 0x9e, 0x89, 0x60, 0x83, 0x0c, 0x16, 0xe0, 0x2f,
-	0x94, 0xd4, 0x52, 0x3d, 0x97, 0x22, 0xd8, 0xb4, 0xbf, 0x28, 0x71, 0x18, 0xc1, 0x0d, 0xcb, 0xe4,
-	0x20, 0x13, 0xd8, 0x10, 0xc3, 0x6c, 0x92, 0xfb, 0xbb, 0xd0, 0x8e, 0x48, 0x49, 0xc4, 0xf6, 0xf6,
-	0xae, 0x2f, 0x9b, 0xc6, 0x3a, 0x33, 0x67, 0xf7, 0x77, 0xa0, 0x85, 0xbd, 0x63, 0x9b, 0xb5, 0xb7,
-	0xb7, 0xb9, 0xde, 0x5d, 0xcc, 0x1a, 0xc3, 0xdf, 0x6b, 0xd0, 0x44, 0xfc, 0xc6, 0xa6, 0xbf, 0x0d,
-	0x5d, 0x94, 0x56, 0x2a, 0x57, 0x61, 0xff, 0x7d, 0xf0, 0x22, 0x25, 0xb9, 0x91, 0x23, 0x6e, 0x5c,
-	0x17, 0x74, 0xad, 0x62, 0x60, 0x56, 0x8c, 0xe3, 0x85, 0xab, 0xa5, 0x33, 0x3e, 0x58, 0xa0, 0x71,
-	0x5e, 0x08, 0xf7, 0xcb, 0x96, 0xa3, 0x91, 0x14, 0x03, 0x83, 0xa9, 0xc8, 0x8c, 0x8f, 0x53, 0x5b,
-	0xd1, 0x2e, 0x73, 0xc8, 0xbf, 0x05, 0xdd, 0x44, 0x8f, 0x78, 0xca, 0xd5, 0x8c, 0xca, 0xd9, 0x65,
-	0x9d, 0x44, 0x0f, 0x10, 0xa2, 0x49, 0xc8, 0x74, 0x34, 0x49, 0x79, 0x4c, 0x15, 0xed, 0xb2, 0x8e,
-	0x90, 0xe9, 0x41, 0xca, 0xe3, 0xf0, 0x04, 0x7a, 0x78, 0xc1, 0x63, 0x61, 0x09, 0x0c, 0xa1, 0x89,
-	0xf9, 0x3b, 0xfa, 0x2e, 0xb2, 0x42, 0x36, 0xff, 0x0e, 0x34, 0xb5, 0xa8, 0x98, 0xdb, 0x58, 0xfa,
-	0x1c, 0x8b, 0x53, 0x46, 0xa6, 0xf0, 0xaf, 0x3a, 0x80, 0x25, 0x9c, 0xd8, 0xbb, 0xd8, 0xeb, 0x1f,
-	0x02, 0xd8, 0x32, 0x8c, 0xec, 0xba, 0x40, 0xbd, 0x67, 0x35, 0x43, 0xa1, 0xfd, 0xf7, 0xec, 0xec,
-	0x8f, 0x12, 0xe1, 0x68, 0x23, 0xb6, 0x87, 0xb8, 0x14, 0x3c, 0x93, 0xcc, 0xe4, 0x48, 0xcd, 0x53,
-	0x19, 0x34, 0xe9, 0xf8, 0x95, 0x0a, 0xef, 0xf3, 0xc5, 0x43, 0x93, 0xb2, 0x2e, 0xba, 0xb0, 0x79,
-	0x2a, 0xf1, 0x18, 0x25, 0x79, 0x64, 0xac, 0xbf, 0xe5, 0xd1, 0x23, 0x0d, 0x99, 0xef, 0x40, 0xdf,
-	0x9a, 0x85, 0x7c, 0x9e, 0x44, 0x96, 0x4e, 0x8f, 0xf5, 0x48, 0xb7, 0x4f, 0xaa, 0x35, 0xe2, 0x3a,
-	0x6b, 0xc4, 0xf9, 0x1f, 0x41, 0xcf, 0xd5, 0x68, 0x85, 0x56, 0xb0, 0x2a, 0x72, 0x58, 0xd6, 0xc9,
-	0x5b, 0xab, 0x93, 0x0f, 0x4d, 0xbd, 0x32, 0x36, 0x28, 0xe3, 0x8d, 0x13, 0x3d, 0x9a, 0xcc, 0xd3,
-	0x94, 0xa6, 0xa6, 0xcb, 0xda, 0x89, 0x3e, 0x98, 0xa7, 0xa9, 0x1f, 0xc2, 0x46, 0x9a, 0x64, 0xa7,
-	0xa3, 0x58, 0xe5, 0xf3, 0x02, 0x09, 0xb1, 0x83, 0xd3, 0x43, 0xe5, 0x37, 0xa8, 0x1b, 0x8a, 0xf0,
-	0x10, 0xda, 0xf6, 0xea, 0xb8, 0x46, 0x05, 0x5f, 0xb8, 0xfd, 0x84, 0xa2, 0xbf, 0x07, 0x60, 0x19,
-	0xe3, 0x59, 0x2c, 0x5d, 0xc5, 0x56, 0x37, 0x29, 0x52, 0x85, 0x26, 0x46, 0xc4, 0x92, 0x18, 0xde,
-	0x07, 0xaf, 0xd2, 0xe3, 0x60, 0x6a, 0xc3, 0x95, 0x71, 0xd5, 0xb3, 0x00, 0x0f, 0x92, 0x99, 0x70,
-	0x95, 0x43, 0x31, 0x7c, 0x0a, 0x9d, 0xa3, 0x3c, 0x5d, 0xc4, 0x79, 0xf6, 0xaf, 0x36, 0xdb, 0x27,
-	0xd0, 0x2e, 0xf2, 0x24, 0x33, 0xda, 0x95, 0xf1, 0xad, 0x65, 0x4e, 0x47, 0xa8, 0x67, 0xce, 0x1c,
-	0xfe, 0x5d, 0x87, 0xcd, 0x65, 0x27, 0x0d, 0x54, 0xac, 0x2f, 0xc5, 0xdf, 0x81, 0x4d, 0xd7, 0x4d,
-	0x65, 0xd7, 0xd8, 0x93, 0xfa, 0x51, 0xf5, 0xbb, 0xa1, 0xa0, 0x81, 0x2b, 0x7b, 0xae, 0x9a, 0x46,
-	0xd7, 0x72, 0xd8, 0x29, 0x85, 0xcd, 0x1e, 0xad, 0x76, 0x1c, 0x3d, 0xa7, 0x19, 0x0a, 0xff, 0x1d,
-	0xfa, 0xb4, 0x8d, 0xdc, 0x7e, 0x45, 0x16, 0x04, 0x86, 0x0c, 0x61, 0x03, 0xd5, 0x5c, 0xc5, 0x23,
-	0x9e, 0x26, 0x5c, 0x97, 0x1d, 0xa4, 0x05, 0x26, 0x3a, 0x40, 0x15, 0x2e, 0x88, 0xbc, 0x90, 0x8a,
-	0x9b, 0x5c, 0x51, 0x07, 0x79, 0xac, 0xc2, 0xfe, 0x5d, 0xd8, 0x28, 0xe5, 0x11, 0xed, 0x79, 0xbb,
-	0x6d, 0xfb, 0xa5, 0xf2, 0x04, 0xf7, 0xfd, 0xca, 0x21, 0xcf, 0x79, 0x3a, 0x97, 0x6e, 0x01, 0xbb,
-	0x43, 0x9e, 0xa2, 0xea, 0xca, 0x96, 0xda, 0x81, 0x4d, 0x6c, 0xfb, 0xd1, 0x59, 0x62, 0xa6, 0xa3,
-	0x4c, 0x9e, 0x1b, 0xb7, 0x8f, 0xfb, 0xa8, 0xfd, 0x3e, 0x31, 0xd3, 0x43, 0x79, 0x6e, 0xb0, 0xc1,
-	0x2f, 0xb4, 0x56, 0x27, 0x76, 0x6d, 0xf5, 0x4b, 0x1d, 0x1a, 0xc7, 0xe2, 0xf2, 0xf0, 0xde, 0x82,
-	0x2e, 0x26, 0x44, 0x09, 0x5b, 0xa2, 0x3b, 0x5a, 0x9c, 0x52, 0xae, 0xce, 0xb4, 0xf2, 0xd9, 0x43,
-	0xd3, 0x21, 0x16, 0x7c, 0x07, 0x9a, 0x5c, 0xc5, 0xfa, 0xf2, 0xd4, 0x1e, 0xd3, 0x3d, 0x18, 0x59,
-	0xf1, 0x22, 0x49, 0x94, 0x67, 0x8e, 0x66, 0x92, 0xb1, 0xd7, 0xe6, 0x2a, 0x75, 0xdc, 0xa2, 0x88,
-	0xa3, 0xe7, 0x76, 0x27, 0x36, 0xad, 0xa3, 0x15, 0xac, 0x0a, 0x3b, 0x77, 0x65, 0x36, 0xc9, 0xc1,
-	0xd2, 0xea, 0x66, 0x93, 0x1c, 0xd6, 0xb6, 0xaf, 0x77, 0x61, 0xfb, 0x06, 0xd0, 0xb1, 0xa3, 0x2a,
-	0x88, 0x50, 0x8f, 0x95, 0x70, 0x6d, 0x1d, 0x58, 0x36, 0xab, 0x3d, 0xfa, 0x53, 0x0d, 0xda, 0xf6,
-	0x2a, 0x38, 0x32, 0xb6, 0x1d, 0x2c, 0x3b, 0x16, 0x5c, 0xf5, 0x1c, 0xa8, 0xbe, 0xef, 0xee, 0x5b,
-	0x5e, 0x7e, 0xdf, 0x67, 0x73, 0x6d, 0xd7, 0x7e, 0x97, 0x91, 0x8c, 0x11, 0xed, 0x00, 0x5b, 0x12,
-	0x2c, 0xa8, 0xaa, 0xde, 0x59, 0x56, 0x3d, 0xbc, 0x0b, 0x2d, 0x9a, 0x1f, 0xbf, 0x0f, 0xb5, 0x73,
-	0xb7, 0x08, 0x6a, 0xe7, 0x88, 0x16, 0xee, 0x81, 0x52, 0x5b, 0x84, 0x3f, 0x40, 0x93, 0xc9, 0x88,
-	0x5e, 0x3a, 0xa9, 0x9c, 0x18, 0xe7, 0x46, 0x32, 0xb2, 0x6d, 0xf2, 0xc2, 0xf9, 0xa2, 0x48, 0x87,
-	0xd3, 0x33, 0xc9, 0xbd, 0xdf, 0x08, 0xe0, 0x76, 0x1b, 0xe7, 0xc6, 0xe4, 0x33, 0x4a, 0xbe, 0xc5,
-	0x1c, 0x0a, 0x63, 0xf0, 0x0e, 0x78, 0x24, 0x07, 0x59, 0x9c, 0xd2, 0xb3, 0x6e, 0xc1, 0xcf, 0xca,
-	0x7d, 0xb4, 0xe0, 0x67, 0x18, 0xac, 0x48, 0x4c, 0x34, 0x75, 0x07, 0x58, 0x40, 0xaf, 0x8d, 0x3c,
-	0x4d, 0xcb, 0x77, 0x0e, 0xca, 0xfe, 0x16, 0x40, 0x94, 0x67, 0x93, 0x44, 0xc8, 0x2c, 0xb2, 0x0c,
-	0xd5, 0xd9, 0x8a, 0x26, 0x3c, 0x07, 0x38, 0x99, 0x4e, 0x0c, 0x93, 0x7a, 0x9e, 0x52, 0x3a, 0xb1,
-	0xcc, 0x84, 0x54, 0xee, 0x30, 0x87, 0x30, 0x03, 0x1e, 0xcb, 0xf2, 0x3a, 0xdc, 0xb2, 0xa6, 0x78,
-	0x54, 0xbd, 0xa9, 0x50, 0xa6, 0xcb, 0x48, 0x3e, 0x37, 0x8b, 0xea, 0x32, 0x84, 0x68, 0xf9, 0xcd,
-	0x12, 0xf7, 0xed, 0x68, 0x31, 0x0b, 0xc2, 0x5f, 0xeb, 0xd0, 0xc1, 0x3b, 0x1e, 0xe5, 0xda, 0xff,
-	0x18, 0xda, 0x2a, 0x42, 0x70, 0xf9, 0x8b, 0x89, 0x14, 0x33, 0x67, 0xc5, 0x2f, 0x57, 0x61, 0x1e,
-	0xc9, 0x89, 0xf9, 0x7a, 0x21, 0xdd, 0x83, 0xf6, 0xd2, 0xca, 0x5b, 0x7a, 0xf8, 0x5f, 0x00, 0x14,
-	0x86, 0x21, 0xd1, 0xe8, 0xdf, 0xb8, 0xda, 0x7f, 0xc5, 0xc5, 0xff, 0x14, 0x3a, 0x85, 0x79, 0x9c,
-	0xcf, 0xcd, 0x94, 0xae, 0x70, 0x85, 0x77, 0x69, 0xa7, 0xd5, 0x6b, 0x0e, 0x73, 0x6d, 0x6f, 0x75,
-	0xe5, 0xea, 0x25, 0xb3, 0xff, 0x19, 0xb4, 0x27, 0x54, 0x47, 0x6a, 0xbb, 0xb5, 0xef, 0x46, 0x55,
-	0x62, 0xe6, 0x5c, 0x70, 0x68, 0x7e, 0x9c, 0xf3, 0x34, 0x31, 0x0b, 0xd7, 0x8f, 0x25, 0xc4, 0x42,
-	0x4e, 0x78, 0x94, 0xf0, 0x74, 0x1f, 0x5f, 0xd5, 0x5d, 0x7a, 0x55, 0xaf, 0x68, 0xc2, 0x3f, 0xeb,
-	0xd0, 0xc5, 0x78, 0xf4, 0xfe, 0xf8, 0x9f, 0xcf, 0xff, 0xca, 0x27, 0x36, 0xf3, 0x04, 0xe9, 0xdc,
-	0xa7, 0xc5, 0xd6, 0x60, 0x0e, 0x85, 0xdf, 0x41, 0xe7, 0xc9, 0xf8, 0x19, 0xb1, 0xbc, 0x03, 0x2d,
-	0x15, 0x3d, 0x19, 0x3f, 0x7b, 0x03, 0xc9, 0xd6, 0x48, 0xab, 0x60, 0xb1, 0x5c, 0x05, 0x0b, 0xfb,
-	0xe2, 0x57, 0xf9, 0x98, 0x08, 0xac, 0x33, 0x92, 0xc3, 0xa7, 0xd0, 0x3f, 0xe2, 0x8a, 0xcf, 0xca,
-	0x89, 0xb8, 0x0b, 0x8d, 0x22, 0xd7, 0x41, 0x8d, 0xf6, 0xfc, 0x8d, 0xf5, 0x2b, 0x1e, 0xe5, 0x9a,
-	0xa1, 0xd5, 0xbf, 0x03, 0x8d, 0x64, 0x16, 0x5f, 0x2e, 0x1c, 0xfd, 0x5f, 0x63, 0x68, 0x0b, 0xbf,
-	0x82, 0xeb, 0x55, 0xdc, 0x87, 0xf9, 0x0c, 0xff, 0x56, 0xe1, 0x3c, 0x4e, 0x24, 0x37, 0x5f, 0x52,
-	0xde, 0x7d, 0x66, 0x41, 0xa9, 0xdd, 0xa3, 0x70, 0x4e, 0xbb, 0xf7, 0x20, 0x78, 0xf1, 0x6a, 0xab,
-	0xf6, 0xf2, 0xd5, 0x56, 0xed, 0x8f, 0x57, 0x5b, 0xb5, 0x9f, 0x5f, 0x6f, 0x5d, 0x7b, 0xf9, 0x7a,
-	0xeb, 0xda, 0x6f, 0xaf, 0xb7, 0xae, 0x8d, 0xdb, 0x74, 0xdc, 0xfd, 0x7f, 0x02, 0x00, 0x00, 0xff,
-	0xff, 0x5f, 0x7f, 0x61, 0xfe, 0xf0, 0x0e, 0x00, 0x00,
+	// 1616 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x6e, 0xdc, 0xc8,
+	0x11, 0xf6, 0xfc, 0x0f, 0x6b, 0x46, 0x8a, 0xcd, 0x38, 0x09, 0xed, 0x24, 0x8a, 0x4c, 0x0b, 0xb1,
+	0x82, 0x24, 0x0e, 0x22, 0xdf, 0x03, 0x8c, 0xad, 0x28, 0x18, 0xc0, 0x96, 0x95, 0x96, 0xe2, 0x20,
+	0xbe, 0x0c, 0x7a, 0xd8, 0x3d, 0x1c, 0x5a, 0x1c, 0x92, 0xe9, 0xee, 0xb1, 0xc4, 0x7b, 0x1e, 0x20,
+	0xef, 0xb1, 0x2f, 0xe2, 0xc3, 0x1e, 0x7c, 0xdc, 0xdb, 0x2e, 0x6c, 0xec, 0x65, 0x5f, 0x60, 0xaf,
+	0x8b, 0xaa, 0x6e, 0x72, 0x66, 0x24, 0x19, 0x30, 0xb0, 0xd7, 0xbd, 0xd5, 0x1f, 0xab, 0xab, 0xbe,
+	0xfa, 0xe9, 0x26, 0x6c, 0x17, 0x2a, 0x37, 0xf9, 0x42, 0xc7, 0x8f, 0x89, 0xf0, 0xfb, 0x15, 0x1f,
+	0xfe, 0x13, 0xbc, 0x33, 0xae, 0xcf, 0x9f, 0xf3, 0xa9, 0x4c, 0xfd, 0x5f, 0x42, 0xd7, 0x70, 0x7d,
+	0x9e, 0x88, 0xa0, 0xb1, 0xdb, 0xd8, 0xf7, 0x98, 0xe3, 0x50, 0xae, 0xc5, 0x79, 0x22, 0x74, 0xd0,
+	0xdc, 0x6d, 0xa1, 0xdc, 0x72, 0xfe, 0x5d, 0xe8, 0x24, 0x99, 0x90, 0x97, 0x41, 0x6b, 0xb7, 0xb1,
+	0xdf, 0x61, 0x96, 0x09, 0x39, 0xc0, 0xa9, 0x38, 0x7f, 0x21, 0xb5, 0xe6, 0xb1, 0xf4, 0x6f, 0x43,
+	0x2b, 0xaa, 0x1d, 0x22, 0xe9, 0xff, 0x19, 0x7a, 0xe8, 0x37, 0xe5, 0xd3, 0xa0, 0xb9, 0xdb, 0xd8,
+	0x1f, 0x1c, 0xfc, 0xfc, 0x71, 0x1d, 0x5e, 0x1d, 0x0b, 0xab, 0x6c, 0x7c, 0x1f, 0xda, 0x82, 0x1b,
+	0x4e, 0x67, 0x0c, 0x19, 0xd1, 0xe1, 0x18, 0x3a, 0xe3, 0x05, 0x7a, 0xbf, 0x0b, 0x9d, 0x8b, 0x44,
+	0x98, 0x39, 0xf9, 0xef, 0x30, 0xcb, 0x60, 0xbc, 0x73, 0x99, 0xc4, 0x73, 0x43, 0x07, 0x74, 0x98,
+	0xe3, 0x6e, 0x74, 0x75, 0x04, 0xed, 0x91, 0x92, 0xdc, 0xdf, 0x86, 0xa6, 0x0b, 0xb3, 0xc3, 0x9a,
+	0x89, 0xf0, 0xef, 0x43, 0xbf, 0xe0, 0x4a, 0x66, 0x26, 0x11, 0xce, 0x4b, 0xcd, 0xa3, 0x9f, 0x8c,
+	0x2f, 0x24, 0xf9, 0xf1, 0x18, 0xd1, 0xe1, 0xbb, 0x26, 0x74, 0x9f, 0xf1, 0x85, 0x54, 0xeb, 0xae,
+	0x3c, 0x72, 0x55, 0x99, 0x37, 0x57, 0xe6, 0x28, 0x33, 0x65, 0x21, 0x1d, 0x72, 0x44, 0xa3, 0x8c,
+	0x0b, 0xa1, 0x82, 0xb6, 0xb5, 0x43, 0x1a, 0x53, 0xe1, 0x4a, 0xf2, 0x44, 0x04, 0x1d, 0x9b, 0x8a,
+	0xe5, 0xfc, 0xdf, 0x80, 0x97, 0xe6, 0x59, 0x9c, 0x98, 0xa5, 0x90, 0x41, 0x77, 0xb7, 0xb1, 0xdf,
+	0x64, 0x2b, 0x01, 0x06, 0x9f, 0x72, 0x63, 0x95, 0x3d, 0x52, 0xd6, 0x3c, 0x9e, 0xa2, 0x8c, 0x2e,
+	0x82, 0xbe, 0x3d, 0x05, 0x69, 0x8a, 0xb8, 0x08, 0x3c, 0x17, 0x71, 0x81, 0x36, 0x45, 0xae, 0x4c,
+	0x00, 0x36, 0x3a, 0xa4, 0xd1, 0xe7, 0x52, 0x4b, 0x45, 0x99, 0x0c, 0xc8, 0xb2, 0xe6, 0x2d, 0x58,
+	0x5a, 0x5f, 0xe4, 0x4a, 0x04, 0x43, 0xab, 0xab, 0x78, 0x2c, 0xd1, 0x54, 0xf1, 0x4c, 0x04, 0x5b,
+	0xa4, 0xb0, 0x0c, 0x7e, 0xa1, 0xa4, 0x96, 0xea, 0xad, 0x14, 0xc1, 0xb6, 0xfd, 0xa2, 0xe2, 0xc3,
+	0x08, 0xee, 0x58, 0x24, 0x47, 0x99, 0xc0, 0x86, 0x18, 0x67, 0xb3, 0xdc, 0xdf, 0x87, 0x6e, 0x44,
+	0x42, 0x02, 0x76, 0x70, 0x70, 0x7b, 0xd5, 0x34, 0xd6, 0x98, 0x39, 0xbd, 0xbf, 0x07, 0x1d, 0xec,
+	0x1d, 0xdb, 0xac, 0x83, 0x83, 0xed, 0xcd, 0xee, 0x62, 0x56, 0x19, 0x7e, 0xdd, 0x80, 0x36, 0xf2,
+	0x9f, 0x6c, 0xfa, 0xfb, 0xd0, 0x47, 0x6a, 0xad, 0x72, 0x35, 0xef, 0xff, 0x1a, 0xbc, 0x48, 0x49,
+	0x6e, 0xe4, 0x84, 0x1b, 0xd7, 0x05, 0x7d, 0x2b, 0x18, 0x99, 0x35, 0xe5, 0xb4, 0x74, 0xb5, 0x74,
+	0xca, 0xa7, 0x25, 0x2a, 0x97, 0x85, 0x70, 0x5f, 0x76, 0x1c, 0x8c, 0x24, 0x18, 0x19, 0x0c, 0x45,
+	0x66, 0x7c, 0x9a, 0xda, 0x8a, 0xf6, 0x99, 0xe3, 0xfc, 0x7b, 0xd0, 0x4f, 0xf4, 0x84, 0xa7, 0x5c,
+	0x2d, 0xa8, 0x9c, 0x7d, 0xd6, 0x4b, 0xf4, 0x08, 0x59, 0x54, 0x09, 0x99, 0x4e, 0x66, 0x29, 0x8f,
+	0xa9, 0xa2, 0x7d, 0xd6, 0x13, 0x32, 0x3d, 0x4a, 0x79, 0x1c, 0x9e, 0xc1, 0x00, 0x13, 0x3c, 0x15,
+	0x16, 0xc0, 0x10, 0xda, 0x18, 0xbf, 0x83, 0xef, 0x2a, 0x2a, 0xa4, 0xf3, 0x1f, 0x40, 0x5b, 0x8b,
+	0x1a, 0xb9, 0xad, 0x95, 0xcd, 0xa9, 0x38, 0x67, 0xa4, 0x0a, 0xbf, 0x6b, 0x02, 0x58, 0xc0, 0x09,
+	0xbd, 0xab, 0xbd, 0xfe, 0x5b, 0x00, 0x5b, 0x86, 0x89, 0x5d, 0x17, 0x28, 0xf7, 0xac, 0x64, 0x2c,
+	0xb4, 0xff, 0x2b, 0x3b, 0xfb, 0x93, 0x44, 0x38, 0xd8, 0x08, 0xed, 0x31, 0x2e, 0x05, 0xcf, 0x24,
+	0x0b, 0x39, 0x51, 0xcb, 0x54, 0x06, 0x6d, 0x3a, 0x7e, 0xad, 0xc2, 0x87, 0xbc, 0x7c, 0x66, 0x52,
+	0xd6, 0x47, 0x13, 0xb6, 0x4c, 0x25, 0x1e, 0xa3, 0x24, 0x8f, 0x8c, 0xb5, 0xb7, 0x38, 0x7a, 0x24,
+	0x21, 0xf5, 0x03, 0x18, 0x5a, 0xb5, 0x90, 0x6f, 0x93, 0xc8, 0xc2, 0xe9, 0xb1, 0x01, 0xc9, 0x0e,
+	0x49, 0xb4, 0x01, 0x5c, 0x6f, 0x03, 0x38, 0xff, 0x77, 0x30, 0x70, 0x35, 0x5a, 0x83, 0x15, 0xac,
+	0x88, 0x0c, 0x56, 0x75, 0xf2, 0x36, 0xea, 0xe4, 0x43, 0x5b, 0xaf, 0x8d, 0x0d, 0xd2, 0x98, 0x71,
+	0xa2, 0x27, 0xb3, 0x65, 0x9a, 0xd2, 0xd4, 0xf4, 0x59, 0x37, 0xd1, 0x47, 0xcb, 0x34, 0xf5, 0x43,
+	0xd8, 0x4a, 0x93, 0xec, 0x7c, 0x12, 0xab, 0x7c, 0x59, 0x20, 0x20, 0x76, 0x70, 0x06, 0x28, 0xfc,
+	0x07, 0xca, 0xc6, 0x22, 0x3c, 0x86, 0xae, 0x4d, 0x1d, 0xd7, 0xa8, 0xe0, 0xa5, 0xdb, 0x4f, 0x48,
+	0xfa, 0x07, 0x00, 0x16, 0x31, 0x9e, 0xc5, 0xd2, 0x55, 0x6c, 0x7d, 0x93, 0x22, 0x54, 0xa8, 0x62,
+	0x04, 0x2c, 0x91, 0xe1, 0x13, 0xf0, 0x6a, 0x39, 0x0e, 0xa6, 0x36, 0x5c, 0x19, 0x57, 0x3d, 0xcb,
+	0xe0, 0x41, 0x32, 0x13, 0xae, 0x72, 0x48, 0x86, 0xaf, 0xa0, 0x77, 0x92, 0xa7, 0x65, 0x9c, 0x67,
+	0x9f, 0xb5, 0xd9, 0x1e, 0x41, 0xb7, 0xc8, 0x93, 0xcc, 0x68, 0x57, 0xc6, 0x9f, 0xad, 0x62, 0x3a,
+	0x41, 0x39, 0x73, 0xea, 0xf0, 0xfb, 0x26, 0x6c, 0xaf, 0x3a, 0x69, 0xa4, 0x62, 0x7d, 0xcd, 0xff,
+	0x1e, 0x6c, 0xbb, 0x6e, 0xaa, 0xba, 0xc6, 0x9e, 0x34, 0x8c, 0xea, 0xef, 0xc6, 0x82, 0x06, 0xae,
+	0xea, 0xb9, 0x7a, 0x1a, 0x5d, 0xcb, 0x61, 0xa7, 0x14, 0x36, 0x7a, 0xd4, 0xda, 0x71, 0xf4, 0x9c,
+	0x64, 0x2c, 0xfc, 0x5f, 0xd0, 0xd5, 0x36, 0x71, 0xfb, 0x15, 0x51, 0x10, 0xe8, 0x32, 0x84, 0x2d,
+	0x14, 0x73, 0x15, 0x4f, 0x78, 0x9a, 0x70, 0x5d, 0x75, 0x90, 0x16, 0x18, 0xe8, 0x08, 0x45, 0xb8,
+	0x20, 0xf2, 0x42, 0x2a, 0x6e, 0x72, 0x45, 0x1d, 0xe4, 0xb1, 0x9a, 0xf7, 0x1f, 0xc2, 0x56, 0x45,
+	0x4f, 0x68, 0xcf, 0xdb, 0x6d, 0x3b, 0xac, 0x84, 0x67, 0xb8, 0xef, 0xd7, 0x0e, 0x79, 0xcb, 0xd3,
+	0xa5, 0x74, 0x0b, 0xd8, 0x1d, 0xf2, 0x0a, 0x45, 0x37, 0xb6, 0xd4, 0x1e, 0x6c, 0x63, 0xdb, 0x4f,
+	0x2e, 0x12, 0x33, 0x9f, 0x64, 0xf2, 0xd2, 0xb8, 0x7d, 0x3c, 0x44, 0xe9, 0xbf, 0x13, 0x33, 0x3f,
+	0x96, 0x97, 0x06, 0x1b, 0xfc, 0x4a, 0x6b, 0xf5, 0x62, 0xd7, 0x56, 0x5f, 0x34, 0xa1, 0x75, 0x2a,
+	0xae, 0x0f, 0xef, 0x3d, 0xe8, 0x63, 0x40, 0x14, 0xb0, 0x05, 0xba, 0xa7, 0xc5, 0x39, 0xc5, 0xea,
+	0x54, 0x6b, 0xd7, 0x1e, 0xaa, 0x8e, 0xb1, 0xe0, 0x7b, 0xd0, 0xe6, 0x2a, 0xd6, 0xd7, 0xa7, 0xf6,
+	0x94, 0xf2, 0x60, 0xa4, 0xc5, 0x44, 0x92, 0x28, 0xcf, 0x1c, 0xcc, 0x44, 0x63, 0xaf, 0x2d, 0x55,
+	0xea, 0xb0, 0x45, 0x12, 0x47, 0xcf, 0xed, 0x4e, 0x6c, 0x5a, 0x07, 0x2b, 0x58, 0x11, 0x76, 0xee,
+	0xda, 0x6c, 0x92, 0x81, 0x85, 0xd5, 0xcd, 0x26, 0x19, 0x6c, 0x6c, 0x5f, 0xef, 0xca, 0xf6, 0x0d,
+	0xa0, 0x67, 0x47, 0x55, 0x10, 0xa0, 0x1e, 0xab, 0xd8, 0x8d, 0x75, 0x60, 0xd1, 0xac, 0xf7, 0xe8,
+	0xff, 0x1a, 0xd0, 0xb5, 0xa9, 0xe0, 0xc8, 0xd8, 0x76, 0xb0, 0xe8, 0x58, 0xe6, 0xa6, 0xe7, 0x40,
+	0x7d, 0xbf, 0xbb, 0xbb, 0xbc, 0xba, 0xdf, 0x17, 0x4b, 0x6d, 0xd7, 0x7e, 0x9f, 0x11, 0x8d, 0x1e,
+	0xed, 0x00, 0x5b, 0x10, 0x2c, 0x53, 0x57, 0xbd, 0xb7, 0xaa, 0x7a, 0xf8, 0x10, 0x3a, 0x34, 0x3f,
+	0xfe, 0x10, 0x1a, 0x97, 0x6e, 0x11, 0x34, 0x2e, 0x91, 0x2b, 0xdd, 0x03, 0xa5, 0x51, 0x86, 0xaf,
+	0xa1, 0xcd, 0x64, 0x44, 0x2f, 0x9d, 0x54, 0xce, 0x8c, 0x33, 0x23, 0x1a, 0xd1, 0x36, 0x79, 0xe1,
+	0x6c, 0x91, 0xa4, 0xc3, 0xe9, 0x99, 0xe4, 0xde, 0x6f, 0xc4, 0xe0, 0x76, 0x9b, 0xe6, 0xc6, 0xe4,
+	0x0b, 0x0a, 0xbe, 0xc3, 0x1c, 0x17, 0xc6, 0xe0, 0x1d, 0xf1, 0x48, 0x8e, 0xb2, 0x38, 0xa5, 0x67,
+	0x5d, 0xc9, 0x2f, 0xaa, 0x7d, 0x54, 0xf2, 0x0b, 0x74, 0x56, 0x24, 0x26, 0x9a, 0xbb, 0x03, 0x2c,
+	0x43, 0xaf, 0x8d, 0x3c, 0x4d, 0xab, 0x77, 0x0e, 0xd2, 0xfe, 0x0e, 0x40, 0x94, 0x67, 0xb3, 0x44,
+	0xc8, 0x2c, 0xb2, 0x08, 0x35, 0xd9, 0x9a, 0x24, 0xbc, 0x04, 0x38, 0x9b, 0xcf, 0x0c, 0x93, 0x7a,
+	0x99, 0x52, 0x38, 0xb1, 0xcc, 0x84, 0x54, 0xee, 0x30, 0xc7, 0x61, 0x04, 0x3c, 0x96, 0x55, 0x3a,
+	0xdc, 0xa2, 0xa6, 0x78, 0x54, 0xbf, 0xa9, 0x90, 0xa6, 0x64, 0x24, 0x5f, 0x9a, 0xb2, 0x4e, 0x86,
+	0x38, 0x5a, 0x7e, 0x8b, 0xc4, 0xdd, 0x1d, 0x1d, 0x66, 0x99, 0xf0, 0xcb, 0x26, 0xf4, 0x30, 0xc7,
+	0x93, 0x5c, 0xfb, 0xbf, 0x87, 0xae, 0x8a, 0x90, 0xb9, 0x7e, 0x63, 0x22, 0xc4, 0xcc, 0x69, 0xf1,
+	0xe6, 0x2a, 0xcc, 0x73, 0x39, 0x33, 0x7f, 0x2f, 0xa5, 0x7b, 0xd0, 0x5e, 0x5b, 0x79, 0x2b, 0x0b,
+	0xff, 0x2f, 0x00, 0x85, 0x61, 0x08, 0x34, 0xda, 0xb7, 0x6e, 0xb6, 0x5f, 0x33, 0xf1, 0xff, 0x00,
+	0xbd, 0xc2, 0xbc, 0xc8, 0x97, 0x66, 0x4e, 0x29, 0xdc, 0x60, 0x5d, 0xe9, 0x69, 0xf5, 0x9a, 0xe3,
+	0x5c, 0xdb, 0xac, 0x6e, 0x5c, 0xbd, 0xa4, 0xf6, 0xff, 0x08, 0xdd, 0x19, 0xd5, 0x91, 0xda, 0x6e,
+	0xe3, 0xde, 0xa8, 0x4b, 0xcc, 0x9c, 0x09, 0x0e, 0xcd, 0x7f, 0x97, 0x3c, 0x4d, 0x4c, 0xe9, 0xfa,
+	0xb1, 0x62, 0xb1, 0x90, 0x33, 0x1e, 0x25, 0x3c, 0x3d, 0xc4, 0x57, 0x75, 0x9f, 0x5e, 0xd5, 0x6b,
+	0x92, 0xf0, 0xdb, 0x26, 0xf4, 0xd1, 0x1f, 0xbd, 0x3f, 0x7e, 0xc2, 0xf3, 0xc7, 0xe2, 0x89, 0xcd,
+	0x3c, 0x43, 0x38, 0x0f, 0x69, 0xb1, 0xb5, 0x98, 0xe3, 0xc2, 0x7f, 0x41, 0xef, 0xe5, 0xf4, 0x0d,
+	0xa1, 0xbc, 0x07, 0x1d, 0x15, 0xbd, 0x9c, 0xbe, 0xf9, 0x04, 0xc8, 0x56, 0x49, 0xab, 0xa0, 0x5c,
+	0xad, 0x82, 0xd2, 0xbe, 0xf8, 0x55, 0x3e, 0x25, 0x00, 0x9b, 0x8c, 0xe8, 0xf0, 0x15, 0x0c, 0x4f,
+	0xb8, 0xe2, 0x8b, 0x6a, 0x22, 0x1e, 0x42, 0xab, 0xc8, 0xb5, 0xf3, 0x7c, 0x67, 0x33, 0xc5, 0x93,
+	0x5c, 0x33, 0xd4, 0xfa, 0x0f, 0xa0, 0x95, 0x2c, 0xe2, 0xeb, 0x85, 0xa3, 0xff, 0x35, 0x86, 0xba,
+	0xf0, 0x6f, 0x70, 0xbb, 0xf6, 0xfb, 0x2c, 0x5f, 0xe0, 0x6f, 0x15, 0xce, 0xe3, 0x4c, 0x72, 0xf3,
+	0x57, 0xf2, 0x3e, 0x64, 0x96, 0xa9, 0xa4, 0x07, 0xe4, 0xce, 0x49, 0x0f, 0x42, 0x01, 0x77, 0x56,
+	0x71, 0x29, 0xbc, 0x52, 0x4d, 0xe9, 0xff, 0x09, 0xba, 0x8a, 0x16, 0x86, 0x8b, 0xef, 0xee, 0xda,
+	0x53, 0xa8, 0x5e, 0x26, 0xcc, 0xd9, 0x7c, 0x4e, 0x94, 0xaf, 0x5d, 0xf6, 0xff, 0xc9, 0xd3, 0x1c,
+	0x31, 0x7b, 0x84, 0x3f, 0xbb, 0x33, 0xca, 0xbf, 0xb5, 0x99, 0xbf, 0xc3, 0x9e, 0x59, 0xfd, 0x67,
+	0xf8, 0x7e, 0x1a, 0xbc, 0xfb, 0xb0, 0xd3, 0x78, 0xff, 0x61, 0xa7, 0xf1, 0xcd, 0x87, 0x9d, 0xc6,
+	0xff, 0x3f, 0xee, 0xdc, 0x7a, 0xff, 0x71, 0xe7, 0xd6, 0x57, 0x1f, 0x77, 0x6e, 0x4d, 0xbb, 0x64,
+	0xfe, 0xe4, 0x87, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0b, 0xba, 0x75, 0x22, 0xb2, 0x0f, 0x00, 0x00,
 }
 
 func (m *TaskLabel) Marshal() (dAtA []byte, err error) {
@@ -3280,27 +3391,25 @@
 	_ = i
 	var l int
 	_ = l
-	if len(m.Pos) > 0 {
-		for _, msg := range m.Pos {
-			dAtA[i] = 0xa
-			i++
-			i = encodeVarintProtomsg(dAtA, i, uint64(msg.Size()))
-			n, err := msg.MarshalTo(dAtA[i:])
-			if err != nil {
-				return 0, err
-			}
-			i += n
+	if m.Pos != nil {
+		dAtA[i] = 0xa
+		i++
+		i = encodeVarintProtomsg(dAtA, i, uint64(m.Pos.Size()))
+		n17, err17 := m.Pos.MarshalTo(dAtA[i:])
+		if err17 != nil {
+			return 0, err17
 		}
+		i += n17
 	}
 	if m.Img != nil {
 		dAtA[i] = 0x12
 		i++
 		i = encodeVarintProtomsg(dAtA, i, uint64(m.Img.Size()))
-		n17, err17 := m.Img.MarshalTo(dAtA[i:])
-		if err17 != nil {
-			return 0, err17
+		n18, err18 := m.Img.MarshalTo(dAtA[i:])
+		if err18 != nil {
+			return 0, err18
 		}
-		i += n17
+		i += n18
 	}
 	return i, nil
 }
@@ -3331,6 +3440,84 @@
 		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
+}
+
+func (m *ParamYoloObj) 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 *ParamYoloObj) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if len(m.Infos) > 0 {
+		for _, msg := range m.Infos {
+			dAtA[i] = 0xa
+			i++
+			i = encodeVarintProtomsg(dAtA, i, uint64(msg.Size()))
+			n, err := msg.MarshalTo(dAtA[i:])
+			if err != nil {
+				return 0, err
+			}
+			i += n
+		}
+	}
+	if m.Img != nil {
+		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
+		}
+		i += n21
 	}
 	return i, nil
 }
@@ -4004,11 +4191,9 @@
 	}
 	var l int
 	_ = l
-	if len(m.Pos) > 0 {
-		for _, e := range m.Pos {
-			l = e.Size()
-			n += 1 + l + sovProtomsg(uint64(l))
-		}
+	if m.Pos != nil {
+		l = m.Pos.Size()
+		n += 1 + l + sovProtomsg(uint64(l))
 	}
 	if m.Img != nil {
 		l = m.Img.Size()
@@ -4029,6 +4214,42 @@
 	}
 	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
+}
+
+func (m *ParamYoloObj) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.Infos) > 0 {
+		for _, e := range m.Infos {
+			l = e.Size()
+			n += 1 + l + sovProtomsg(uint64(l))
+		}
+	}
+	if m.Img != nil {
+		l = m.Img.Size()
 		n += 1 + l + sovProtomsg(uint64(l))
 	}
 	return n
@@ -8657,8 +8878,10 @@
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Pos = append(m.Pos, &FacePos{})
-			if err := m.Pos[len(m.Pos)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			if m.Pos == nil {
+				m.Pos = &FacePos{}
+			}
+			if err := m.Pos.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -8843,6 +9066,254 @@
 	}
 	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:
+			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 *ParamYoloObj) 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: ParamYoloObj: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: ParamYoloObj: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Infos", 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
+			}
+			m.Infos = append(m.Infos, &ObjInfo{})
+			if err := m.Infos[len(m.Infos)-1].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:
+			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 skipProtomsg(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0

--
Gitblit v1.8.0