From c404f7d36eb29728e8d9f3da25090bb4aff7c81f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 06 十二月 2019 14:42:48 +0800
Subject: [PATCH] update
---
sdk.pb.go | 363 ++++++++++++++++++++-------------------------------
sdk.proto | 15 -
2 files changed, 146 insertions(+), 232 deletions(-)
diff --git a/sdk.pb.go b/sdk.pb.go
index dfcf436..e74b1df 100644
--- a/sdk.pb.go
+++ b/sdk.pb.go
@@ -1414,15 +1414,12 @@
}
type HumanTrack struct {
- Left int32 `protobuf:"varint,1,opt,name=left,proto3" json:"left,omitempty"`
- Right int32 `protobuf:"varint,2,opt,name=right,proto3" json:"right,omitempty"`
- Top int32 `protobuf:"varint,3,opt,name=top,proto3" json:"top,omitempty"`
- Bottom int32 `protobuf:"varint,4,opt,name=bottom,proto3" json:"bottom,omitempty"`
- Confidence float32 `protobuf:"fixed32,5,opt,name=confidence,proto3" json:"confidence,omitempty"`
- X int32 `protobuf:"varint,6,opt,name=x,proto3" json:"x,omitempty"`
- Y int32 `protobuf:"varint,7,opt,name=y,proto3" json:"y,omitempty"`
- Id int32 `protobuf:"varint,8,opt,name=id,proto3" json:"id,omitempty"`
- Feature []float32 `protobuf:"fixed32,9,rep,packed,name=feature,proto3" json:"feature,omitempty"`
+ RcHuman *Rect `protobuf:"bytes,1,opt,name=rcHuman,proto3" json:"rcHuman,omitempty"`
+ Confidence float32 `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
+ X int32 `protobuf:"varint,3,opt,name=x,proto3" json:"x,omitempty"`
+ Y int32 `protobuf:"varint,4,opt,name=y,proto3" json:"y,omitempty"`
+ Id int32 `protobuf:"varint,5,opt,name=id,proto3" json:"id,omitempty"`
+ Feature []float32 `protobuf:"fixed32,6,rep,packed,name=feature,proto3" json:"feature,omitempty"`
}
func (m *HumanTrack) Reset() { *m = HumanTrack{} }
@@ -1458,32 +1455,11 @@
var xxx_messageInfo_HumanTrack proto.InternalMessageInfo
-func (m *HumanTrack) GetLeft() int32 {
+func (m *HumanTrack) GetRcHuman() *Rect {
if m != nil {
- return m.Left
+ return m.RcHuman
}
- return 0
-}
-
-func (m *HumanTrack) GetRight() int32 {
- if m != nil {
- return m.Right
- }
- return 0
-}
-
-func (m *HumanTrack) GetTop() int32 {
- if m != nil {
- return m.Top
- }
- return 0
-}
-
-func (m *HumanTrack) GetBottom() int32 {
- if m != nil {
- return m.Bottom
- }
- return 0
+ return nil
}
func (m *HumanTrack) GetConfidence() float32 {
@@ -1589,95 +1565,94 @@
func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) }
var fileDescriptor_70decb0fb6f436df = []byte{
- // 1403 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0x4f, 0x6f, 0xdb, 0xc6,
- 0x12, 0x0f, 0x25, 0x53, 0xb2, 0xc6, 0x8a, 0xad, 0x6c, 0x82, 0x07, 0xc2, 0x78, 0x10, 0x04, 0xbe,
- 0x87, 0x44, 0xef, 0x35, 0x75, 0x13, 0x37, 0x68, 0xaf, 0x89, 0xed, 0x04, 0x31, 0x90, 0x38, 0xc6,
- 0x26, 0x48, 0xd1, 0xe3, 0x8a, 0x5c, 0x49, 0xb4, 0x49, 0x2e, 0x4b, 0xad, 0x12, 0x0b, 0xfd, 0x04,
- 0xbd, 0xf5, 0x43, 0xf4, 0xdc, 0x8f, 0x51, 0xf4, 0x98, 0x63, 0x8f, 0x45, 0xd2, 0x7e, 0x84, 0xde,
- 0x8b, 0x99, 0x5d, 0xfe, 0x91, 0xac, 0x24, 0x28, 0xd0, 0x63, 0x4f, 0xda, 0xdf, 0xec, 0x68, 0xe7,
- 0xdf, 0x6f, 0x66, 0x97, 0xd0, 0x99, 0x85, 0xe7, 0x7b, 0x59, 0xae, 0xb4, 0x62, 0x9b, 0xf4, 0x93,
- 0xcc, 0x26, 0xbb, 0x30, 0x12, 0x33, 0x69, 0xa4, 0xfe, 0x77, 0x0e, 0xb8, 0xc7, 0x89, 0x98, 0x48,
- 0x76, 0x03, 0xdc, 0xd7, 0x51, 0xa8, 0xa7, 0x9e, 0x33, 0x70, 0x86, 0x2e, 0x37, 0x80, 0xfd, 0x0b,
- 0x5a, 0x53, 0x19, 0x4d, 0xa6, 0xda, 0x6b, 0x90, 0xd8, 0x22, 0xc6, 0x60, 0x23, 0x14, 0x5a, 0x78,
- 0xcd, 0x81, 0x33, 0xec, 0x72, 0x5a, 0xb3, 0x7f, 0x43, 0x47, 0x47, 0x89, 0x9c, 0x69, 0x91, 0x64,
- 0xde, 0xc6, 0xc0, 0x19, 0x76, 0x78, 0x25, 0x60, 0xdb, 0xd0, 0x88, 0x42, 0xcf, 0x1d, 0x38, 0xc3,
- 0x26, 0x6f, 0x44, 0x21, 0xeb, 0x41, 0x33, 0x88, 0x42, 0xaf, 0x45, 0x7a, 0xb8, 0xf4, 0x27, 0xd0,
- 0x79, 0x24, 0x02, 0xf9, 0x20, 0x9d, 0xc4, 0x12, 0xb7, 0x17, 0xe2, 0xb5, 0x75, 0x06, 0x97, 0xe8,
- 0x60, 0x16, 0xe9, 0x60, 0x6a, 0x3d, 0x31, 0x00, 0x1d, 0xc9, 0x55, 0x1c, 0x93, 0x23, 0x2e, 0xa7,
- 0x35, 0xeb, 0x03, 0x04, 0x2a, 0x1d, 0x47, 0xa1, 0x4c, 0x03, 0x49, 0x9e, 0x34, 0x78, 0x4d, 0xe2,
- 0x5f, 0x00, 0xbc, 0x98, 0x8e, 0x35, 0x97, 0xb3, 0x79, 0xac, 0x31, 0xc4, 0x89, 0x4c, 0x43, 0x99,
- 0x5b, 0x63, 0x16, 0xa1, 0x07, 0x62, 0x22, 0xad, 0x35, 0x5c, 0x92, 0x2d, 0x11, 0xc8, 0xd2, 0x96,
- 0x08, 0x24, 0xfe, 0x7b, 0x24, 0xc5, 0x5c, 0x2f, 0xc8, 0x8e, 0xcb, 0x2d, 0x42, 0x6f, 0x67, 0x49,
- 0x14, 0x4b, 0x8a, 0xd8, 0xe5, 0x06, 0xf8, 0xbf, 0x35, 0xa0, 0x8d, 0x31, 0x9e, 0xaa, 0x19, 0xbb,
- 0x09, 0xad, 0x3c, 0x40, 0x40, 0x76, 0xb7, 0xf6, 0xb7, 0xf7, 0x8a, 0x0a, 0xed, 0x71, 0x19, 0x68,
- 0x6e, 0x77, 0xd9, 0xa7, 0xd0, 0xc9, 0xf4, 0x13, 0x39, 0xd6, 0x0f, 0x17, 0xc6, 0x9b, 0xad, 0xfd,
- 0x9d, 0x4a, 0xf5, 0x54, 0x45, 0xa9, 0xe6, 0x95, 0x06, 0xfb, 0x0c, 0x20, 0xd3, 0x1c, 0x8b, 0x84,
- 0xfa, 0xcd, 0xf5, 0xfa, 0x35, 0x15, 0xf6, 0x3f, 0x68, 0x67, 0xfa, 0xa9, 0x9a, 0xeb, 0x29, 0x85,
- 0xb0, 0x46, 0xbb, 0xd8, 0x67, 0xb7, 0xa0, 0x95, 0xe9, 0x13, 0x35, 0x33, 0x51, 0xad, 0xd1, 0xb4,
- 0xdb, 0xec, 0x13, 0x68, 0x8d, 0xa9, 0x8e, 0x54, 0xdf, 0xad, 0xfd, 0xeb, 0x95, 0x62, 0x59, 0x62,
- 0x6e, 0x55, 0x98, 0x07, 0xed, 0x6f, 0xe6, 0x22, 0x8e, 0xf4, 0xc2, 0x6b, 0x53, 0xb2, 0x0a, 0x88,
- 0x85, 0x1c, 0x8b, 0x20, 0x12, 0xf1, 0x11, 0x72, 0x6d, 0x93, 0xb8, 0x56, 0x93, 0x60, 0xf2, 0xc7,
- 0x22, 0x90, 0xc7, 0x47, 0x5e, 0x67, 0xe0, 0x0c, 0x37, 0xb8, 0x45, 0xfe, 0xef, 0x0d, 0xd8, 0x44,
- 0x3b, 0xc7, 0xe9, 0x58, 0xfd, 0x93, 0xe7, 0xbf, 0x3b, 0xcf, 0xcd, 0x32, 0xcf, 0xe7, 0xd0, 0x7e,
- 0x36, 0x3a, 0xa3, 0x2c, 0xff, 0x17, 0xdc, 0x3c, 0x78, 0x36, 0x3a, 0x7b, 0x4f, 0x92, 0xcd, 0x26,
- 0xf6, 0x94, 0x5e, 0x64, 0x45, 0x4f, 0xe9, 0x45, 0x86, 0x3d, 0x95, 0xe5, 0x6a, 0x44, 0x09, 0x6c,
- 0x70, 0x5a, 0x63, 0xef, 0xa8, 0xd1, 0xd9, 0xf1, 0x11, 0xe5, 0x69, 0x83, 0x1b, 0xe0, 0x7f, 0x0b,
- 0x3d, 0xd3, 0xb1, 0x18, 0xd9, 0x91, 0xd4, 0x32, 0xd0, 0xec, 0x3f, 0xd0, 0xcc, 0xd4, 0xcc, 0xda,
- 0xbc, 0xb6, 0x1c, 0xfc, 0xa9, 0x9a, 0x71, 0xdc, 0x65, 0xb7, 0xa1, 0x95, 0xd3, 0x1f, 0x6d, 0x55,
- 0x6f, 0x54, 0x7a, 0xd5, 0x18, 0xe0, 0x56, 0x07, 0x8d, 0x8f, 0xa5, 0xd0, 0x33, 0x3b, 0xda, 0x0c,
- 0xf0, 0xef, 0x43, 0xf7, 0x54, 0xe4, 0x22, 0x29, 0x9a, 0xf7, 0x0e, 0xb8, 0x98, 0x03, 0x34, 0xdd,
- 0x1c, 0x6e, 0xed, 0xef, 0xd6, 0xc3, 0x5d, 0xf6, 0x91, 0x1b, 0x45, 0xff, 0xac, 0xee, 0xfe, 0xc3,
- 0x0b, 0x7d, 0xa8, 0x92, 0xca, 0x96, 0x53, 0xb3, 0x85, 0x29, 0x09, 0x54, 0x62, 0xb2, 0xd4, 0xe5,
- 0xb4, 0x66, 0xb7, 0x4d, 0xa0, 0x86, 0x66, 0x1f, 0xb2, 0x86, 0x6a, 0xfe, 0x63, 0xe8, 0x95, 0xde,
- 0x3e, 0x92, 0x42, 0xcf, 0x73, 0xc9, 0xee, 0x41, 0x5b, 0x92, 0x55, 0x3c, 0xf8, 0xbd, 0x3e, 0x1b,
- 0xc7, 0x78, 0xa1, 0xea, 0x7f, 0x69, 0xe3, 0xfe, 0x5a, 0xc5, 0x0a, 0x0b, 0x78, 0x0b, 0xdc, 0x28,
- 0x1d, 0xab, 0x22, 0xee, 0x5a, 0xca, 0x2d, 0x11, 0xb8, 0xd9, 0xf7, 0x1f, 0x41, 0xeb, 0xb9, 0x22,
- 0x66, 0x98, 0xc1, 0xef, 0xd0, 0x9c, 0xc7, 0xc1, 0x8f, 0x93, 0x31, 0x3c, 0x3f, 0x0e, 0x29, 0xbe,
- 0x0e, 0x37, 0x00, 0x29, 0x36, 0x53, 0x27, 0x22, 0x31, 0xad, 0xd4, 0xe1, 0x16, 0xf9, 0x7f, 0x6c,
- 0x40, 0xfb, 0x34, 0x16, 0x5a, 0x1e, 0x1f, 0x21, 0x81, 0xe3, 0x28, 0x90, 0xe9, 0x4c, 0xda, 0xe3,
- 0x0a, 0x88, 0x67, 0x06, 0x2a, 0x56, 0x79, 0x71, 0x26, 0x01, 0x3c, 0x33, 0x3d, 0x24, 0xb1, 0x99,
- 0xd8, 0x16, 0xa1, 0x76, 0xfa, 0x62, 0x91, 0x49, 0x3b, 0xb2, 0x0d, 0x60, 0x03, 0xd8, 0x4a, 0x0f,
- 0xab, 0x6b, 0xc3, 0xcc, 0xed, 0xba, 0x08, 0xed, 0xa7, 0x07, 0x39, 0xdd, 0x86, 0x2d, 0xd3, 0x40,
- 0x16, 0x62, 0x03, 0xa5, 0x47, 0x51, 0x2e, 0x03, 0x1d, 0xa9, 0xd4, 0x76, 0x57, 0x4d, 0xc2, 0xf6,
- 0x00, 0xf2, 0xe0, 0x89, 0x0a, 0x04, 0xed, 0x6f, 0xae, 0x6d, 0x91, 0x9a, 0x86, 0xf1, 0x30, 0x4a,
- 0x24, 0xf5, 0x1b, 0x79, 0x18, 0x25, 0x92, 0xac, 0x1c, 0x8a, 0xdc, 0xba, 0x00, 0xd6, 0x4a, 0x29,
- 0xc1, 0x0b, 0xf8, 0xe4, 0x50, 0xe4, 0x26, 0xe4, 0x2d, 0xda, 0xae, 0x04, 0x6c, 0x17, 0x36, 0x51,
- 0xf7, 0x89, 0x9a, 0x28, 0xaf, 0x4b, 0x9b, 0x25, 0x2e, 0xf6, 0x28, 0x29, 0x57, 0xab, 0x3d, 0xca,
- 0xcb, 0x2e, 0x6c, 0x66, 0x58, 0x80, 0x83, 0x28, 0xf5, 0xb6, 0x89, 0x92, 0x25, 0x66, 0x37, 0x61,
- 0x3b, 0x3d, 0x88, 0x52, 0x2a, 0xd0, 0x57, 0xf4, 0x7a, 0xd8, 0x21, 0x8d, 0x15, 0x29, 0x1b, 0xc2,
- 0x4e, 0x29, 0x79, 0x6c, 0xde, 0x13, 0x3d, 0x52, 0x5c, 0x15, 0xb3, 0x2f, 0x60, 0x1b, 0xf3, 0x30,
- 0x51, 0x65, 0xb6, 0xae, 0xad, 0xcd, 0xd6, 0x8a, 0x16, 0xc6, 0x8e, 0x1e, 0x3f, 0x55, 0xa1, 0x8c,
- 0x3d, 0x46, 0x67, 0x57, 0x02, 0x76, 0x07, 0xae, 0x97, 0xa0, 0x56, 0xe3, 0xeb, 0xa4, 0xb7, 0x6e,
- 0xcb, 0xff, 0xa1, 0x09, 0x5d, 0xcb, 0xbb, 0xc3, 0x58, 0xcd, 0xc3, 0x0f, 0x90, 0x6f, 0xb9, 0xb8,
- 0x8d, 0x8f, 0x16, 0x77, 0x85, 0x68, 0xcd, 0xcb, 0x44, 0x5b, 0x4f, 0xd0, 0x65, 0x92, 0xb9, 0x97,
- 0x48, 0x66, 0x53, 0x60, 0xca, 0x6f, 0x08, 0x5a, 0x09, 0x0a, 0xf2, 0x10, 0xb8, 0x5b, 0x52, 0xb4,
- 0x94, 0xac, 0x90, 0x6b, 0xf3, 0x12, 0xb9, 0x3c, 0x68, 0x8f, 0x73, 0x91, 0xc8, 0x13, 0x65, 0x49,
- 0x59, 0x40, 0xb4, 0x8b, 0x23, 0xce, 0xd4, 0xdf, 0xb0, 0xb2, 0x12, 0xd8, 0xbb, 0xa5, 0xa8, 0xba,
- 0x61, 0x65, 0x4d, 0xc2, 0x7c, 0xe8, 0x4e, 0x72, 0xb1, 0xa0, 0x51, 0x15, 0x8b, 0x89, 0xa5, 0xe6,
- 0x92, 0x0c, 0x6d, 0x07, 0x53, 0x91, 0x9f, 0xcc, 0x13, 0xcb, 0xce, 0x02, 0xfa, 0x3f, 0xba, 0xb0,
- 0x6d, 0xcb, 0xf4, 0x52, 0x4e, 0xa3, 0x20, 0x36, 0x69, 0x22, 0x11, 0x1d, 0xe7, 0xd8, 0x40, 0x4a,
- 0x49, 0x6d, 0x2a, 0x34, 0xd6, 0x4f, 0x85, 0x66, 0x3d, 0xe9, 0xb5, 0xb2, 0x6f, 0x2c, 0x97, 0xfd,
- 0xe3, 0xf3, 0x82, 0xba, 0xca, 0xfa, 0xdd, 0x2a, 0xba, 0xca, 0x60, 0xea, 0x08, 0x5c, 0xd7, 0x4e,
- 0x68, 0x0f, 0x9a, 0x43, 0x97, 0xaf, 0x8a, 0xff, 0xf2, 0xec, 0xb8, 0x07, 0x57, 0xf3, 0x80, 0x1a,
- 0xdb, 0xfe, 0xa5, 0xb3, 0xf6, 0x2f, 0xcb, 0x4a, 0x18, 0xcd, 0x2b, 0x93, 0x40, 0xca, 0x01, 0x50,
- 0xac, 0x75, 0x11, 0x16, 0xca, 0xc2, 0x83, 0x5c, 0xa4, 0x21, 0x95, 0xb2, 0xc3, 0x97, 0x64, 0x98,
- 0x7b, 0x8b, 0x9f, 0xcf, 0x47, 0x54, 0xca, 0x0e, 0xaf, 0x49, 0x6a, 0x67, 0xe0, 0x91, 0x77, 0xa9,
- 0x9a, 0xd5, 0x19, 0x24, 0x23, 0xa2, 0xbd, 0x0a, 0x31, 0x01, 0x34, 0x6e, 0x1a, 0xbc, 0x80, 0x44,
- 0x25, 0x5c, 0x98, 0x74, 0xed, 0x98, 0x77, 0x7d, 0x25, 0x61, 0xff, 0x87, 0x5e, 0xfa, 0xb2, 0x34,
- 0x66, 0x46, 0x41, 0x8f, 0xf2, 0x7e, 0x49, 0x4e, 0x93, 0xeb, 0x65, 0xe1, 0x3a, 0x51, 0xf3, 0x1a,
- 0x69, 0xae, 0x48, 0xeb, 0x7a, 0xb6, 0x75, 0xd8, 0xb2, 0x9e, 0x6d, 0x9f, 0x55, 0xbd, 0x7d, 0x1a,
- 0x2e, 0xab, 0x7a, 0xfb, 0xfe, 0x03, 0xb8, 0x6a, 0xf9, 0x6a, 0x3f, 0x3f, 0xee, 0x94, 0xaf, 0x13,
- 0x73, 0xa5, 0x7a, 0xb5, 0xb7, 0xde, 0x12, 0xb1, 0x8b, 0x17, 0x8a, 0xff, 0x93, 0x03, 0xf0, 0x78,
- 0x9e, 0x88, 0xf4, 0x45, 0x2e, 0x82, 0x73, 0x7c, 0x2e, 0xc4, 0x72, 0xac, 0x2d, 0xd3, 0x69, 0x8d,
- 0x5c, 0xce, 0x6b, 0x5f, 0x6d, 0x06, 0xd0, 0xeb, 0x4b, 0x65, 0x96, 0xdf, 0xb8, 0xa4, 0xaf, 0x17,
- 0xa5, 0xb5, 0x4a, 0xca, 0xaf, 0x17, 0x42, 0x2b, 0x5f, 0x50, 0xee, 0xea, 0x17, 0x14, 0xeb, 0x82,
- 0x73, 0x61, 0x29, 0xed, 0x5c, 0x20, 0x2a, 0x9e, 0x94, 0xce, 0xc2, 0xde, 0xf7, 0x66, 0x80, 0xe0,
- 0x7d, 0x8f, 0xf5, 0x34, 0x6f, 0x10, 0xaf, 0x33, 0x68, 0x52, 0x3d, 0x0d, 0xf4, 0xef, 0x43, 0xaf,
- 0x8a, 0xc3, 0xa6, 0xe3, 0xf6, 0x4a, 0x3a, 0x6a, 0x8f, 0xb5, 0x9a, 0xae, 0xd5, 0x39, 0xf0, 0x7e,
- 0x7e, 0xdb, 0x77, 0xde, 0xbc, 0xed, 0x3b, 0xbf, 0xbe, 0xed, 0x3b, 0xdf, 0xbf, 0xeb, 0x5f, 0x79,
- 0xf3, 0xae, 0x7f, 0xe5, 0x97, 0x77, 0xfd, 0x2b, 0xa3, 0x16, 0xfd, 0xed, 0xf3, 0x3f, 0x03, 0x00,
- 0x00, 0xff, 0xff, 0x12, 0x1e, 0x68, 0x10, 0x02, 0x0f, 0x00, 0x00,
+ // 1379 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x6e, 0xdb, 0xc6,
+ 0x13, 0x0f, 0x25, 0x53, 0x1f, 0x63, 0xc5, 0x56, 0x36, 0xc1, 0x1f, 0x84, 0xf1, 0x87, 0x20, 0xb0,
+ 0x45, 0xa2, 0xb6, 0xa9, 0x9b, 0xb8, 0x41, 0x7b, 0x4d, 0x6c, 0x27, 0x88, 0x81, 0xc4, 0x31, 0x36,
+ 0x41, 0x8a, 0x1e, 0x57, 0xe4, 0x4a, 0xa2, 0x4d, 0x72, 0x55, 0x6a, 0x95, 0x58, 0xe8, 0x13, 0xf4,
+ 0xd6, 0x07, 0xe8, 0xb1, 0xe7, 0x3e, 0x47, 0x8f, 0x39, 0xf6, 0x58, 0x24, 0xed, 0x23, 0xf4, 0x5e,
+ 0xcc, 0xec, 0xf2, 0x43, 0xb2, 0x9c, 0xa0, 0x40, 0x8f, 0x3d, 0x69, 0x7f, 0xb3, 0xa3, 0x9d, 0xaf,
+ 0xdf, 0xcc, 0x2e, 0xa1, 0x3d, 0x0b, 0xcf, 0x76, 0xa7, 0x99, 0xd2, 0x8a, 0xb5, 0xe8, 0x27, 0x99,
+ 0x8d, 0x77, 0x60, 0x28, 0x66, 0xd2, 0x48, 0xfd, 0x1f, 0x1c, 0x70, 0x8f, 0x12, 0x31, 0x96, 0xec,
+ 0x06, 0xb8, 0xaf, 0xa3, 0x50, 0x4f, 0x3c, 0xa7, 0xef, 0x0c, 0x5c, 0x6e, 0x00, 0xfb, 0x1f, 0x34,
+ 0x26, 0x32, 0x1a, 0x4f, 0xb4, 0x57, 0x23, 0xb1, 0x45, 0x8c, 0xc1, 0x46, 0x28, 0xb4, 0xf0, 0xea,
+ 0x7d, 0x67, 0xd0, 0xe1, 0xb4, 0x66, 0xff, 0x87, 0xb6, 0x8e, 0x12, 0x39, 0xd3, 0x22, 0x99, 0x7a,
+ 0x1b, 0x7d, 0x67, 0xd0, 0xe6, 0xa5, 0x80, 0x6d, 0x41, 0x2d, 0x0a, 0x3d, 0xb7, 0xef, 0x0c, 0xea,
+ 0xbc, 0x16, 0x85, 0xac, 0x0b, 0xf5, 0x20, 0x0a, 0xbd, 0x06, 0xe9, 0xe1, 0xd2, 0x1f, 0x43, 0xfb,
+ 0x91, 0x08, 0xe4, 0x83, 0x74, 0x1c, 0x4b, 0xdc, 0x5e, 0x88, 0xd7, 0xd6, 0x19, 0x5c, 0xa2, 0x83,
+ 0xd3, 0x48, 0x07, 0x13, 0xeb, 0x89, 0x01, 0xe8, 0x48, 0xa6, 0xe2, 0x98, 0x1c, 0x71, 0x39, 0xad,
+ 0x59, 0x0f, 0x20, 0x50, 0xe9, 0x28, 0x0a, 0x65, 0x1a, 0x48, 0xf2, 0xa4, 0xc6, 0x2b, 0x12, 0xff,
+ 0x1c, 0xe0, 0xc5, 0x64, 0xa4, 0xb9, 0x9c, 0xcd, 0x63, 0x8d, 0x21, 0x8e, 0x65, 0x1a, 0xca, 0xcc,
+ 0x1a, 0xb3, 0x08, 0x3d, 0x10, 0x63, 0x69, 0xad, 0xe1, 0x92, 0x6c, 0x89, 0x40, 0x16, 0xb6, 0x44,
+ 0x20, 0xf1, 0xdf, 0x43, 0x29, 0xe6, 0x7a, 0x41, 0x76, 0x5c, 0x6e, 0x11, 0x7a, 0x3b, 0x4b, 0xa2,
+ 0x58, 0x52, 0xc4, 0x2e, 0x37, 0xc0, 0xff, 0xa3, 0x06, 0x4d, 0x8c, 0xf1, 0x44, 0xcd, 0xd8, 0x4d,
+ 0x68, 0x64, 0x01, 0x02, 0xb2, 0xbb, 0xb9, 0xb7, 0xb5, 0x9b, 0x57, 0x68, 0x97, 0xcb, 0x40, 0x73,
+ 0xbb, 0xcb, 0x3e, 0x87, 0xf6, 0x54, 0x3f, 0x91, 0x23, 0xfd, 0x70, 0x61, 0xbc, 0xd9, 0xdc, 0xdb,
+ 0x2e, 0x55, 0x4f, 0x54, 0x94, 0x6a, 0x5e, 0x6a, 0xb0, 0x2f, 0x00, 0xa6, 0x9a, 0x63, 0x91, 0x50,
+ 0xbf, 0xbe, 0x5e, 0xbf, 0xa2, 0xc2, 0x3e, 0x81, 0xe6, 0x54, 0x3f, 0x55, 0x73, 0x3d, 0xa1, 0x10,
+ 0xd6, 0x68, 0xe7, 0xfb, 0xec, 0x16, 0x34, 0xa6, 0xfa, 0x58, 0xcd, 0x4c, 0x54, 0x6b, 0x34, 0xed,
+ 0x36, 0xfb, 0x0c, 0x1a, 0x23, 0xaa, 0x23, 0xd5, 0x77, 0x73, 0xef, 0x7a, 0xa9, 0x58, 0x94, 0x98,
+ 0x5b, 0x15, 0xe6, 0x41, 0xf3, 0xbb, 0xb9, 0x88, 0x23, 0xbd, 0xf0, 0x9a, 0x94, 0xac, 0x1c, 0x62,
+ 0x21, 0x47, 0x22, 0x88, 0x44, 0x7c, 0x88, 0x5c, 0x6b, 0x11, 0xd7, 0x2a, 0x12, 0x4c, 0xfe, 0x48,
+ 0x04, 0xf2, 0xe8, 0xd0, 0x6b, 0xf7, 0x9d, 0xc1, 0x06, 0xb7, 0xc8, 0xff, 0xb3, 0x06, 0x2d, 0xb4,
+ 0x73, 0x94, 0x8e, 0xd4, 0x7f, 0x79, 0xfe, 0xb7, 0xf3, 0x5c, 0x2f, 0xf2, 0x7c, 0x06, 0xcd, 0x67,
+ 0xc3, 0x53, 0xca, 0xf2, 0xc7, 0xe0, 0x66, 0xc1, 0xb3, 0xe1, 0xe9, 0x25, 0x49, 0x36, 0x9b, 0xd8,
+ 0x53, 0x7a, 0x31, 0xcd, 0x7b, 0x4a, 0x2f, 0xa6, 0xd8, 0x53, 0xd3, 0x4c, 0x0d, 0x29, 0x81, 0x35,
+ 0x4e, 0x6b, 0xec, 0x1d, 0x35, 0x3c, 0x3d, 0x3a, 0xa4, 0x3c, 0x6d, 0x70, 0x03, 0xfc, 0xef, 0xa1,
+ 0x6b, 0x3a, 0x16, 0x23, 0x3b, 0x94, 0x5a, 0x06, 0x9a, 0x7d, 0x04, 0xf5, 0xa9, 0x9a, 0x59, 0x9b,
+ 0xd7, 0x96, 0x83, 0x3f, 0x51, 0x33, 0x8e, 0xbb, 0xec, 0x36, 0x34, 0x32, 0xfa, 0xa3, 0xad, 0xea,
+ 0x8d, 0x52, 0xaf, 0x1c, 0x03, 0xdc, 0xea, 0xa0, 0xf1, 0x91, 0x14, 0x7a, 0x66, 0x47, 0x9b, 0x01,
+ 0xfe, 0x7d, 0xe8, 0x9c, 0x88, 0x4c, 0x24, 0x79, 0xf3, 0xde, 0x01, 0x17, 0x73, 0x80, 0xa6, 0xeb,
+ 0x83, 0xcd, 0xbd, 0x9d, 0x6a, 0xb8, 0xcb, 0x3e, 0x72, 0xa3, 0xe8, 0x9f, 0x56, 0xdd, 0x7f, 0x78,
+ 0xae, 0x0f, 0x54, 0x52, 0xda, 0x72, 0x2a, 0xb6, 0x30, 0x25, 0x81, 0x4a, 0x4c, 0x96, 0x3a, 0x9c,
+ 0xd6, 0xec, 0xb6, 0x09, 0xd4, 0xd0, 0xec, 0x7d, 0xd6, 0x50, 0xcd, 0x7f, 0x0c, 0xdd, 0xc2, 0xdb,
+ 0x47, 0x52, 0xe8, 0x79, 0x26, 0xd9, 0x3d, 0x68, 0x4a, 0xb2, 0x8a, 0x07, 0x5f, 0xea, 0xb3, 0x71,
+ 0x8c, 0xe7, 0xaa, 0xfe, 0xd7, 0x36, 0xee, 0x6f, 0x55, 0xac, 0xb0, 0x80, 0xb7, 0xc0, 0x8d, 0xd2,
+ 0x91, 0xca, 0xe3, 0xae, 0xa4, 0xdc, 0x12, 0x81, 0x9b, 0x7d, 0xff, 0x11, 0x34, 0x9e, 0x2b, 0x62,
+ 0x86, 0x19, 0xfc, 0x0e, 0xcd, 0x79, 0x1c, 0xfc, 0x38, 0x19, 0xc3, 0xb3, 0xa3, 0x90, 0xe2, 0x6b,
+ 0x73, 0x03, 0x90, 0x62, 0x33, 0x75, 0x2c, 0x12, 0xd3, 0x4a, 0x6d, 0x6e, 0x91, 0xff, 0xd7, 0x06,
+ 0x34, 0x4f, 0x62, 0xa1, 0xe5, 0xd1, 0x21, 0x12, 0x38, 0x8e, 0x02, 0x99, 0xce, 0xa4, 0x3d, 0x2e,
+ 0x87, 0x78, 0x66, 0xa0, 0x62, 0x95, 0xe5, 0x67, 0x12, 0xc0, 0x33, 0xd3, 0x03, 0x12, 0x9b, 0x89,
+ 0x6d, 0x11, 0x6a, 0xa7, 0x2f, 0x16, 0x53, 0x69, 0x47, 0xb6, 0x01, 0xac, 0x0f, 0x9b, 0xe9, 0x41,
+ 0x79, 0x6d, 0x98, 0xb9, 0x5d, 0x15, 0xa1, 0xfd, 0x74, 0x3f, 0xa3, 0xdb, 0xb0, 0x61, 0x1a, 0xc8,
+ 0x42, 0x6c, 0xa0, 0xf4, 0x30, 0xca, 0x64, 0xa0, 0x23, 0x95, 0xda, 0xee, 0xaa, 0x48, 0xd8, 0x2e,
+ 0x40, 0x16, 0x3c, 0x51, 0x81, 0xa0, 0xfd, 0xd6, 0xda, 0x16, 0xa9, 0x68, 0x18, 0x0f, 0xa3, 0x44,
+ 0x52, 0xbf, 0x91, 0x87, 0x51, 0x22, 0xc9, 0xca, 0x81, 0xc8, 0xac, 0x0b, 0x60, 0xad, 0x14, 0x12,
+ 0xbc, 0x80, 0x8f, 0x0f, 0x44, 0x66, 0x42, 0xde, 0xa4, 0xed, 0x52, 0xc0, 0x76, 0xa0, 0x85, 0xba,
+ 0x4f, 0xd4, 0x58, 0x79, 0x1d, 0xda, 0x2c, 0x70, 0xbe, 0x47, 0x49, 0xb9, 0x5a, 0xee, 0x51, 0x5e,
+ 0x76, 0xa0, 0x35, 0xc5, 0x02, 0xec, 0x47, 0xa9, 0xb7, 0x45, 0x94, 0x2c, 0x30, 0xbb, 0x09, 0x5b,
+ 0xe9, 0x7e, 0x94, 0x52, 0x81, 0xbe, 0xa1, 0xd7, 0xc3, 0x36, 0x69, 0xac, 0x48, 0xd9, 0x00, 0xb6,
+ 0x0b, 0xc9, 0x63, 0xf3, 0x9e, 0xe8, 0x92, 0xe2, 0xaa, 0x98, 0x7d, 0x05, 0x5b, 0x98, 0x87, 0xb1,
+ 0x2a, 0xb2, 0x75, 0x6d, 0x6d, 0xb6, 0x56, 0xb4, 0x30, 0x76, 0xf4, 0xf8, 0xa9, 0x0a, 0x65, 0xec,
+ 0x31, 0x3a, 0xbb, 0x14, 0xb0, 0x3b, 0x70, 0xbd, 0x00, 0x95, 0x1a, 0x5f, 0x27, 0xbd, 0x75, 0x5b,
+ 0xfe, 0xcf, 0x75, 0xe8, 0x58, 0xde, 0x1d, 0xc4, 0x6a, 0x1e, 0xbe, 0x87, 0x7c, 0xcb, 0xc5, 0xad,
+ 0x7d, 0xb0, 0xb8, 0x2b, 0x44, 0xab, 0x5f, 0x24, 0xda, 0x7a, 0x82, 0x2e, 0x93, 0xcc, 0xbd, 0x40,
+ 0x32, 0x9b, 0x02, 0x53, 0x7e, 0x43, 0xd0, 0x52, 0x90, 0x93, 0x87, 0xc0, 0xdd, 0x82, 0xa2, 0x85,
+ 0x64, 0x85, 0x5c, 0xad, 0x0b, 0xe4, 0xf2, 0xa0, 0x39, 0xca, 0x44, 0x22, 0x8f, 0x95, 0x25, 0x65,
+ 0x0e, 0xd1, 0x2e, 0x8e, 0x38, 0x53, 0x7f, 0xc3, 0xca, 0x52, 0x60, 0xef, 0x96, 0xbc, 0xea, 0x86,
+ 0x95, 0x15, 0x09, 0xf3, 0xa1, 0x33, 0xce, 0xc4, 0x82, 0x46, 0x55, 0x2c, 0xc6, 0x96, 0x9a, 0x4b,
+ 0x32, 0xb4, 0x1d, 0x4c, 0x44, 0x76, 0x3c, 0x4f, 0x2c, 0x3b, 0x73, 0xe8, 0xff, 0xe2, 0xc2, 0x96,
+ 0x2d, 0xd3, 0x4b, 0x39, 0x89, 0x82, 0xd8, 0xa4, 0x89, 0x44, 0x74, 0x9c, 0x63, 0x03, 0x29, 0x24,
+ 0x95, 0xa9, 0x50, 0x5b, 0x3f, 0x15, 0xea, 0xd5, 0xa4, 0x57, 0xca, 0xbe, 0xb1, 0x5c, 0xf6, 0x0f,
+ 0xcf, 0x0b, 0xea, 0x2a, 0xeb, 0x77, 0x23, 0xef, 0x2a, 0x83, 0xa9, 0x23, 0x70, 0x5d, 0x39, 0xa1,
+ 0xd9, 0xaf, 0x0f, 0x5c, 0xbe, 0x2a, 0xfe, 0xc7, 0xb3, 0xe3, 0x1e, 0x5c, 0xcd, 0x02, 0x6a, 0x6c,
+ 0xfb, 0x97, 0xf6, 0xda, 0xbf, 0x2c, 0x2b, 0x61, 0x34, 0xaf, 0x4c, 0x02, 0x29, 0x07, 0x40, 0xb1,
+ 0x56, 0x45, 0x58, 0x28, 0x0b, 0xf7, 0x33, 0x91, 0x86, 0x54, 0xca, 0x36, 0x5f, 0x92, 0x61, 0xee,
+ 0x2d, 0x7e, 0x3e, 0x1f, 0x52, 0x29, 0xdb, 0xbc, 0x22, 0xa9, 0x9c, 0x81, 0x47, 0xde, 0xa5, 0x6a,
+ 0x96, 0x67, 0x90, 0x8c, 0x88, 0xf6, 0x2a, 0xc4, 0x04, 0xd0, 0xb8, 0xa9, 0xf1, 0x1c, 0x12, 0x95,
+ 0x70, 0x61, 0xd2, 0xb5, 0x6d, 0xde, 0xf5, 0xa5, 0x84, 0x7d, 0x0a, 0xdd, 0xf4, 0x65, 0x61, 0xcc,
+ 0x8c, 0x82, 0x2e, 0xe5, 0xfd, 0x82, 0x9c, 0x26, 0xd7, 0xcb, 0xdc, 0x75, 0xa2, 0xe6, 0x35, 0xd2,
+ 0x5c, 0x91, 0x56, 0xf5, 0x6c, 0xeb, 0xb0, 0x65, 0x3d, 0xdb, 0x3e, 0xab, 0x7a, 0x7b, 0x34, 0x5c,
+ 0x56, 0xf5, 0xf6, 0xfc, 0x07, 0x70, 0xd5, 0xf2, 0xd5, 0x7e, 0x7e, 0xdc, 0x29, 0x5e, 0x27, 0xe6,
+ 0x4a, 0xf5, 0x2a, 0x6f, 0xbd, 0x25, 0x62, 0xe7, 0x2f, 0x14, 0xff, 0x27, 0x07, 0xe0, 0xf1, 0x3c,
+ 0x11, 0xe9, 0x8b, 0x4c, 0x04, 0x67, 0x6c, 0x00, 0xcd, 0x2c, 0x20, 0x7c, 0xc9, 0xdb, 0x2b, 0xdf,
+ 0x5e, 0xf9, 0x2e, 0xaa, 0xad, 0x7e, 0x17, 0xb1, 0x0e, 0x38, 0xe7, 0x96, 0xfd, 0xce, 0x39, 0xa2,
+ 0xfc, 0xa3, 0xc6, 0x59, 0x54, 0x3e, 0xdf, 0x5c, 0xba, 0xc5, 0xb1, 0x4a, 0xe6, 0x65, 0xe1, 0x35,
+ 0xfa, 0x75, 0xaa, 0x92, 0x81, 0xfe, 0x7d, 0xe8, 0x96, 0xde, 0xd9, 0x20, 0x6f, 0xaf, 0x04, 0x59,
+ 0x79, 0x82, 0x55, 0x74, 0xad, 0xce, 0xbe, 0xf7, 0xeb, 0xdb, 0x9e, 0xf3, 0xe6, 0x6d, 0xcf, 0xf9,
+ 0xfd, 0x6d, 0xcf, 0xf9, 0xf1, 0x5d, 0xef, 0xca, 0x9b, 0x77, 0xbd, 0x2b, 0xbf, 0xbd, 0xeb, 0x5d,
+ 0x19, 0x36, 0xe8, 0x6f, 0x5f, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x90, 0x69, 0x91, 0xd8,
+ 0x0e, 0x00, 0x00,
}
func (m *Image) Marshal() (dAtA []byte, err error) {
@@ -2678,54 +2653,44 @@
_ = i
var l int
_ = l
- if m.Left != 0 {
- dAtA[i] = 0x8
+ if m.RcHuman != nil {
+ dAtA[i] = 0xa
i++
- i = encodeVarintSdk(dAtA, i, uint64(m.Left))
- }
- if m.Right != 0 {
- dAtA[i] = 0x10
- i++
- i = encodeVarintSdk(dAtA, i, uint64(m.Right))
- }
- if m.Top != 0 {
- dAtA[i] = 0x18
- i++
- i = encodeVarintSdk(dAtA, i, uint64(m.Top))
- }
- if m.Bottom != 0 {
- dAtA[i] = 0x20
- i++
- i = encodeVarintSdk(dAtA, i, uint64(m.Bottom))
+ i = encodeVarintSdk(dAtA, i, uint64(m.RcHuman.Size()))
+ n24, err24 := m.RcHuman.MarshalTo(dAtA[i:])
+ if err24 != nil {
+ return 0, err24
+ }
+ i += n24
}
if m.Confidence != 0 {
- dAtA[i] = 0x2d
+ dAtA[i] = 0x15
i++
encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Confidence))))
i += 4
}
if m.X != 0 {
- dAtA[i] = 0x30
+ dAtA[i] = 0x18
i++
i = encodeVarintSdk(dAtA, i, uint64(m.X))
}
if m.Y != 0 {
- dAtA[i] = 0x38
+ dAtA[i] = 0x20
i++
i = encodeVarintSdk(dAtA, i, uint64(m.Y))
}
if m.Id != 0 {
- dAtA[i] = 0x40
+ dAtA[i] = 0x28
i++
i = encodeVarintSdk(dAtA, i, uint64(m.Id))
}
if len(m.Feature) > 0 {
- dAtA[i] = 0x4a
+ dAtA[i] = 0x32
i++
i = encodeVarintSdk(dAtA, i, uint64(len(m.Feature)*4))
for _, num := range m.Feature {
- f24 := math.Float32bits(float32(num))
- encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f24))
+ f25 := math.Float32bits(float32(num))
+ encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f25))
i += 4
}
}
@@ -3285,17 +3250,9 @@
}
var l int
_ = l
- if m.Left != 0 {
- n += 1 + sovSdk(uint64(m.Left))
- }
- if m.Right != 0 {
- n += 1 + sovSdk(uint64(m.Right))
- }
- if m.Top != 0 {
- n += 1 + sovSdk(uint64(m.Top))
- }
- if m.Bottom != 0 {
- n += 1 + sovSdk(uint64(m.Bottom))
+ if m.RcHuman != nil {
+ l = m.RcHuman.Size()
+ n += 1 + l + sovSdk(uint64(l))
}
if m.Confidence != 0 {
n += 5
@@ -6916,10 +6873,10 @@
}
switch fieldNum {
case 1:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field Left", wireType)
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field RcHuman", wireType)
}
- m.Left = 0
+ var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowSdk
@@ -6929,69 +6886,29 @@
}
b := dAtA[iNdEx]
iNdEx++
- m.Left |= int32(b&0x7F) << shift
+ 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.RcHuman == nil {
+ m.RcHuman = &Rect{}
+ }
+ if err := m.RcHuman.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
case 2:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field Right", wireType)
- }
- m.Right = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowSdk
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.Right |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- case 3:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field Top", wireType)
- }
- m.Top = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowSdk
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.Top |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- case 4:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field Bottom", wireType)
- }
- m.Bottom = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowSdk
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.Bottom |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- case 5:
if wireType != 5 {
return fmt.Errorf("proto: wrong wireType = %d for field Confidence", wireType)
}
@@ -7002,7 +6919,7 @@
v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
iNdEx += 4
m.Confidence = float32(math.Float32frombits(v))
- case 6:
+ case 3:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field X", wireType)
}
@@ -7021,7 +6938,7 @@
break
}
}
- case 7:
+ case 4:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Y", wireType)
}
@@ -7040,7 +6957,7 @@
break
}
}
- case 8:
+ case 5:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
}
@@ -7059,7 +6976,7 @@
break
}
}
- case 9:
+ case 6:
if wireType == 5 {
var v uint32
if (iNdEx + 4) > l {
diff --git a/sdk.proto b/sdk.proto
index f8a663c..8fcec05 100644
--- a/sdk.proto
+++ b/sdk.proto
@@ -171,15 +171,12 @@
}
message HumanTrack {
- int32 left = 1;
- int32 right = 2;
- int32 top = 3;
- int32 bottom = 4;
- float confidence = 5;
- int32 x = 6;
- int32 y = 7;
- int32 id = 8;
- repeated float feature = 9;
+ Rect rcHuman = 1;
+ float confidence = 2;
+ int32 x = 3;
+ int32 y = 4;
+ int32 id = 5;
+ repeated float feature = 6;
}
message HumanTrackResult {
--
Gitblit v1.8.0