From e9a80c14906919733e50c393b93d94c2dde20efd Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期六, 06 七月 2019 13:28:21 +0800
Subject: [PATCH] update sdk
---
sdk.pb.go | 140 ++++++++++++++++++++++++++++++++--------------
sdk.proto | 3
protomsg.pb.go | 10 ++
es.pb.go | 10 ++
4 files changed, 114 insertions(+), 49 deletions(-)
diff --git a/es.pb.go b/es.pb.go
index f71bc74..7e89f29 100644
--- a/es.pb.go
+++ b/es.pb.go
@@ -9,7 +9,6 @@
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
- math_bits "math/bits"
)
// Reference imports to suppress errors if they are not otherwise used.
@@ -587,7 +586,14 @@
}
func sovEs(x uint64) (n int) {
- return (math_bits.Len64(x|1) + 6) / 7
+ for {
+ n++
+ x >>= 7
+ if x == 0 {
+ break
+ }
+ }
+ return n
}
func sozEs(x uint64) (n int) {
return sovEs(uint64((x << 1) ^ uint64((int64(x) >> 63))))
diff --git a/protomsg.pb.go b/protomsg.pb.go
index 5ea3105..0d332d5 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -9,7 +9,6 @@
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
- math_bits "math/bits"
)
// Reference imports to suppress errors if they are not otherwise used.
@@ -3419,7 +3418,14 @@
}
func sovProtomsg(x uint64) (n int) {
- return (math_bits.Len64(x|1) + 6) / 7
+ for {
+ n++
+ x >>= 7
+ if x == 0 {
+ break
+ }
+ }
+ return n
}
func sozProtomsg(x uint64) (n int) {
return sovProtomsg(uint64((x << 1) ^ uint64((int64(x) >> 63))))
diff --git a/sdk.pb.go b/sdk.pb.go
index f1c447b..62365a4 100644
--- a/sdk.pb.go
+++ b/sdk.pb.go
@@ -523,6 +523,7 @@
type ResultFaceDetect struct {
Pos *FacePos `protobuf:"bytes,1,opt,name=pos,proto3" json:"pos,omitempty"`
Result *ThftResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
+ Feats []byte `protobuf:"bytes,3,opt,name=feats,proto3" json:"feats,omitempty"`
}
func (m *ResultFaceDetect) Reset() { *m = ResultFaceDetect{} }
@@ -568,6 +569,13 @@
func (m *ResultFaceDetect) GetResult() *ThftResult {
if m != nil {
return m.Result
+ }
+ return nil
+}
+
+func (m *ResultFaceDetect) GetFeats() []byte {
+ if m != nil {
+ return m.Feats
}
return nil
}
@@ -782,50 +790,50 @@
func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) }
var fileDescriptor_70decb0fb6f436df = []byte{
- // 679 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x53, 0x4d, 0x6f, 0xd3, 0x40,
- 0x10, 0xad, 0x9d, 0xda, 0x69, 0x26, 0x51, 0x29, 0x4b, 0x85, 0xac, 0x0a, 0x59, 0x91, 0x41, 0x34,
- 0x88, 0x52, 0x50, 0x40, 0xe2, 0xca, 0x47, 0x5b, 0x51, 0x09, 0x68, 0xb4, 0x82, 0x03, 0xc7, 0x8d,
- 0xbd, 0x76, 0x5c, 0x6c, 0xaf, 0xb1, 0x37, 0x6a, 0xf3, 0x13, 0xb8, 0xf1, 0xb3, 0x38, 0x70, 0xe8,
- 0x91, 0x23, 0x6a, 0xc5, 0xff, 0x40, 0xb3, 0xbb, 0x6e, 0x52, 0x29, 0xe5, 0xc2, 0x95, 0x93, 0xe7,
- 0xed, 0x3c, 0xef, 0xbc, 0x37, 0xb3, 0x03, 0x9d, 0x3a, 0xfa, 0xbc, 0x5b, 0x56, 0x42, 0x0a, 0xb2,
- 0xa6, 0x3e, 0x79, 0x9d, 0x6c, 0xc1, 0x98, 0xd5, 0x5c, 0x9f, 0x06, 0x5f, 0x2d, 0x70, 0x0e, 0x73,
- 0x96, 0x70, 0xb2, 0x09, 0xce, 0x49, 0x1a, 0xc9, 0x89, 0x67, 0xf5, 0xad, 0x81, 0x43, 0x35, 0x20,
- 0xb7, 0xc1, 0x9d, 0xf0, 0x34, 0x99, 0x48, 0xcf, 0x56, 0xc7, 0x06, 0x11, 0x02, 0xab, 0x11, 0x93,
- 0xcc, 0x6b, 0xf5, 0xad, 0x41, 0x8f, 0xaa, 0x98, 0xdc, 0x81, 0x8e, 0x4c, 0x73, 0x5e, 0x4b, 0x96,
- 0x97, 0xde, 0x6a, 0xdf, 0x1a, 0x74, 0xe8, 0xfc, 0x80, 0xac, 0x83, 0x9d, 0x46, 0x9e, 0xd3, 0xb7,
- 0x06, 0x2d, 0x6a, 0xa7, 0x11, 0xd9, 0x80, 0x56, 0x98, 0x46, 0x9e, 0xab, 0x78, 0x18, 0x06, 0x09,
- 0x74, 0x0e, 0x58, 0xc8, 0x5f, 0x16, 0x49, 0xc6, 0x31, 0x3d, 0x63, 0x27, 0x46, 0x0c, 0x86, 0x28,
- 0xb0, 0x4c, 0x65, 0x38, 0x31, 0x4a, 0x34, 0x40, 0x21, 0x95, 0xc8, 0x32, 0x25, 0xc4, 0xa1, 0x2a,
- 0x26, 0x3e, 0x40, 0x28, 0x8a, 0x38, 0x8d, 0x78, 0x11, 0x72, 0xa5, 0xc4, 0xa6, 0x0b, 0x27, 0xc1,
- 0x29, 0xc0, 0x87, 0x49, 0x2c, 0x29, 0xaf, 0xa7, 0x99, 0x44, 0x8b, 0x09, 0x2f, 0x22, 0x5e, 0x99,
- 0x62, 0x06, 0xa1, 0x02, 0x96, 0x70, 0x53, 0x0d, 0x43, 0x55, 0x8b, 0x85, 0xfc, 0xb2, 0x16, 0x0b,
- 0x39, 0xfe, 0x3d, 0xe6, 0x6c, 0x2a, 0x67, 0xaa, 0x8e, 0x43, 0x0d, 0x42, 0xb5, 0x75, 0x9e, 0x66,
- 0x5c, 0x39, 0x76, 0xa8, 0x06, 0xc1, 0x0f, 0x1b, 0xda, 0xe8, 0x71, 0x24, 0x6a, 0x72, 0x1f, 0xdc,
- 0x2a, 0x44, 0xa0, 0xea, 0x76, 0x87, 0xeb, 0xbb, 0xcd, 0x84, 0x76, 0x29, 0x0f, 0x25, 0x35, 0x59,
- 0xf2, 0x08, 0x3a, 0xa5, 0x7c, 0xcb, 0x63, 0xb9, 0x3f, 0xd3, 0x6a, 0xba, 0xc3, 0x1b, 0x73, 0xea,
- 0x48, 0xa4, 0x85, 0xa4, 0x73, 0x06, 0x79, 0x0c, 0x50, 0x4a, 0x8a, 0x43, 0x42, 0x7e, 0x6b, 0x39,
- 0x7f, 0x81, 0x42, 0x1e, 0x40, 0xbb, 0x94, 0xef, 0xc4, 0x54, 0x4e, 0x94, 0x85, 0x25, 0xec, 0x26,
- 0x4f, 0xb6, 0xc1, 0x2d, 0xe5, 0x7b, 0x51, 0x6b, 0x57, 0x4b, 0x98, 0x26, 0x4d, 0x1e, 0x82, 0x1b,
- 0xab, 0x39, 0xaa, 0xf9, 0x76, 0x87, 0xb7, 0xe6, 0xc4, 0xcb, 0x11, 0x53, 0x43, 0x21, 0x1e, 0xb4,
- 0xbf, 0x4c, 0x59, 0x96, 0xca, 0x99, 0xd7, 0x56, 0xcd, 0x6a, 0x20, 0x0e, 0x32, 0x66, 0x61, 0xca,
- 0xb2, 0x3d, 0x7c, 0x6b, 0x6b, 0xea, 0xad, 0x2d, 0x9c, 0x04, 0xbf, 0x6d, 0x58, 0xc3, 0xfb, 0x0e,
- 0x8b, 0x58, 0xfc, 0xef, 0xe7, 0x3f, 0xf7, 0x13, 0x1f, 0x73, 0x8c, 0xed, 0xdc, 0xf3, 0x3a, 0x6a,
- 0x4f, 0x0d, 0x0a, 0x3e, 0x42, 0xfb, 0x68, 0x7c, 0xac, 0xba, 0x7c, 0x0f, 0x9c, 0x2a, 0x3c, 0x1a,
- 0x1f, 0x5f, 0xd3, 0x64, 0x9d, 0xc4, 0xdd, 0x91, 0xb3, 0xb2, 0xd9, 0x1d, 0x39, 0x2b, 0x71, 0x77,
- 0xca, 0x4a, 0x8c, 0x55, 0x03, 0x6d, 0xaa, 0xe2, 0x80, 0xc3, 0x86, 0xde, 0x41, 0xf4, 0xb0, 0xc7,
- 0x25, 0x0f, 0x25, 0xb9, 0x0b, 0xad, 0x52, 0xd4, 0xe6, 0xf6, 0x9b, 0x57, 0x6d, 0x8e, 0x44, 0x4d,
- 0x31, 0x4b, 0x76, 0xc0, 0xad, 0xd4, 0x8f, 0x66, 0x7e, 0x9b, 0x73, 0xde, 0x7c, 0xb1, 0xa9, 0xe1,
- 0x04, 0x2f, 0xa0, 0x37, 0x62, 0x15, 0xcb, 0x9b, 0xc5, 0x7b, 0x02, 0x0e, 0xfa, 0xc2, 0x22, 0xad,
- 0x41, 0x77, 0xb8, 0xb5, 0x68, 0xe1, 0xaa, 0x1a, 0xaa, 0x89, 0xc1, 0xf1, 0xa2, 0xd0, 0xfd, 0x53,
- 0xf9, 0x5a, 0xe4, 0xb8, 0xe0, 0x31, 0x67, 0x52, 0x4b, 0xed, 0x51, 0x0d, 0xd0, 0x66, 0x28, 0x72,
- 0xed, 0xbc, 0x47, 0x55, 0x4c, 0x76, 0xb4, 0x25, 0xfd, 0x74, 0xfe, 0x56, 0x0d, 0x69, 0xc1, 0x1b,
- 0xd8, 0xb8, 0x54, 0x7b, 0xc0, 0x99, 0x9c, 0x56, 0x9c, 0x3c, 0x83, 0x36, 0x57, 0x55, 0xf1, 0xe2,
- 0x6b, 0x35, 0x6b, 0x61, 0xb4, 0xa1, 0x06, 0xcf, 0x8d, 0xef, 0x4f, 0x22, 0x13, 0x38, 0x94, 0x6d,
- 0x70, 0xd2, 0x22, 0x16, 0x8d, 0xef, 0x85, 0xe6, 0x9a, 0xe1, 0x52, 0x9d, 0x7f, 0xe5, 0x7d, 0x3f,
- 0xf7, 0xad, 0xb3, 0x73, 0xdf, 0xfa, 0x75, 0xee, 0x5b, 0xdf, 0x2e, 0xfc, 0x95, 0xb3, 0x0b, 0x7f,
- 0xe5, 0xe7, 0x85, 0xbf, 0x32, 0x76, 0xd5, 0x2f, 0x4f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xe7,
- 0x0c, 0x05, 0xd9, 0x58, 0x06, 0x00, 0x00,
+ // 687 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x54, 0x4f, 0x6f, 0xd3, 0x4e,
+ 0x10, 0xad, 0x93, 0xda, 0x69, 0x26, 0x55, 0x7f, 0xfd, 0x2d, 0x15, 0xb2, 0x2a, 0x64, 0x45, 0x06,
+ 0xd1, 0x20, 0x4a, 0x41, 0x01, 0x89, 0x2b, 0x7f, 0xda, 0x8a, 0x4a, 0x40, 0xa3, 0x15, 0x1c, 0x38,
+ 0x6e, 0xec, 0xb5, 0xe3, 0x62, 0x7b, 0x8d, 0xbd, 0x51, 0x1b, 0xf1, 0x09, 0xb8, 0xf1, 0xb1, 0x38,
+ 0x70, 0xe8, 0x91, 0x23, 0x6a, 0xc5, 0xf7, 0x40, 0xb3, 0xbb, 0xae, 0x5d, 0xa9, 0xe5, 0xc2, 0x95,
+ 0x53, 0x66, 0x76, 0x9e, 0xf7, 0xbd, 0x37, 0xb3, 0x13, 0xe8, 0x57, 0xe1, 0xc7, 0x9d, 0xa2, 0x14,
+ 0x52, 0x90, 0x15, 0xf5, 0x93, 0x55, 0xf1, 0x26, 0x4c, 0x59, 0xc5, 0xf5, 0xa9, 0xff, 0xc5, 0x02,
+ 0xfb, 0x20, 0x63, 0x31, 0x27, 0x1b, 0x60, 0x1f, 0x27, 0xa1, 0x9c, 0xb9, 0xd6, 0xd0, 0x1a, 0xd9,
+ 0x54, 0x27, 0xe4, 0x26, 0x38, 0x33, 0x9e, 0xc4, 0x33, 0xe9, 0x76, 0xd4, 0xb1, 0xc9, 0x08, 0x81,
+ 0xe5, 0x90, 0x49, 0xe6, 0x76, 0x87, 0xd6, 0x68, 0x95, 0xaa, 0x98, 0xdc, 0x82, 0xbe, 0x4c, 0x32,
+ 0x5e, 0x49, 0x96, 0x15, 0xee, 0xf2, 0xd0, 0x1a, 0xf5, 0x69, 0x73, 0x40, 0xd6, 0xa0, 0x93, 0x84,
+ 0xae, 0x3d, 0xb4, 0x46, 0x5d, 0xda, 0x49, 0x42, 0xb2, 0x0e, 0xdd, 0x20, 0x09, 0x5d, 0x47, 0xe1,
+ 0x30, 0xf4, 0x63, 0xe8, 0xef, 0xb3, 0x80, 0x3f, 0xcf, 0xe3, 0x94, 0x63, 0x79, 0xc1, 0x8e, 0x8d,
+ 0x18, 0x0c, 0x51, 0x60, 0x91, 0xc8, 0x60, 0x66, 0x94, 0xe8, 0x04, 0x85, 0x94, 0x22, 0x4d, 0x95,
+ 0x10, 0x9b, 0xaa, 0x98, 0x78, 0x00, 0x81, 0xc8, 0xa3, 0x24, 0xe4, 0x79, 0xc0, 0x95, 0x92, 0x0e,
+ 0x6d, 0x9d, 0xf8, 0x27, 0x00, 0xef, 0x66, 0x91, 0xa4, 0xbc, 0x9a, 0xa7, 0x12, 0x2d, 0xc6, 0x3c,
+ 0x0f, 0x79, 0x69, 0xc8, 0x4c, 0x86, 0x0a, 0x58, 0xcc, 0x0d, 0x1b, 0x86, 0x8a, 0x8b, 0x05, 0xfc,
+ 0x82, 0x8b, 0x05, 0x1c, 0xbf, 0x9e, 0x72, 0x36, 0x97, 0x0b, 0xc5, 0x63, 0x53, 0x93, 0xa1, 0xda,
+ 0x2a, 0x4b, 0x52, 0xae, 0x1c, 0xdb, 0x54, 0x27, 0xfe, 0xf7, 0x0e, 0xf4, 0xd0, 0xe3, 0x44, 0x54,
+ 0xe4, 0x2e, 0x38, 0x65, 0x80, 0x89, 0xe2, 0x1d, 0x8c, 0xd7, 0x76, 0xea, 0x09, 0xed, 0x50, 0x1e,
+ 0x48, 0x6a, 0xaa, 0xe4, 0x01, 0xf4, 0x0b, 0xf9, 0x9a, 0x47, 0x72, 0x6f, 0xa1, 0xd5, 0x0c, 0xc6,
+ 0xff, 0x35, 0xd0, 0x89, 0x48, 0x72, 0x49, 0x1b, 0x04, 0x79, 0x08, 0x50, 0x48, 0x8a, 0x43, 0x42,
+ 0x7c, 0xf7, 0x6a, 0x7c, 0x0b, 0x42, 0xee, 0x41, 0xaf, 0x90, 0x6f, 0xc4, 0x5c, 0xce, 0x94, 0x85,
+ 0x2b, 0xd0, 0x75, 0x9d, 0x6c, 0x81, 0x53, 0xc8, 0xb7, 0xa2, 0xd2, 0xae, 0xae, 0x40, 0x9a, 0x32,
+ 0xb9, 0x0f, 0x4e, 0xa4, 0xe6, 0xa8, 0xe6, 0x3b, 0x18, 0xdf, 0x68, 0x80, 0x17, 0x23, 0xa6, 0x06,
+ 0x42, 0x5c, 0xe8, 0x7d, 0x9a, 0xb3, 0x34, 0x91, 0x0b, 0xb7, 0xa7, 0x9a, 0x55, 0xa7, 0x38, 0xc8,
+ 0x88, 0x05, 0x09, 0x4b, 0x77, 0xf1, 0xad, 0xad, 0xa8, 0xb7, 0xd6, 0x3a, 0xf1, 0x7f, 0x75, 0x60,
+ 0x05, 0xef, 0x3b, 0xc8, 0x23, 0xf1, 0xaf, 0x9f, 0x7f, 0xdd, 0x4f, 0x7c, 0xcc, 0x11, 0xb6, 0x73,
+ 0xd7, 0xed, 0xab, 0x3d, 0x35, 0x99, 0xff, 0x1e, 0x7a, 0x87, 0xd3, 0x23, 0xd5, 0xe5, 0x3b, 0x60,
+ 0x97, 0xc1, 0xe1, 0xf4, 0xe8, 0x9a, 0x26, 0xeb, 0x22, 0xee, 0x8e, 0x5c, 0x14, 0xf5, 0xee, 0xc8,
+ 0x45, 0x81, 0xbb, 0x53, 0x94, 0x62, 0xaa, 0x1a, 0xd8, 0xa1, 0x2a, 0xf6, 0x3f, 0xc3, 0xba, 0xde,
+ 0x41, 0xf4, 0xb0, 0xcb, 0x25, 0x0f, 0x24, 0xb9, 0x0d, 0xdd, 0x42, 0x54, 0xe6, 0xf6, 0xff, 0x2f,
+ 0xdb, 0x9c, 0x88, 0x8a, 0x62, 0x95, 0x6c, 0x83, 0x53, 0xaa, 0x0f, 0xcd, 0xfc, 0x36, 0x1a, 0x5c,
+ 0xb3, 0xd8, 0xd4, 0x60, 0x70, 0x15, 0x23, 0xce, 0x64, 0x65, 0xfe, 0xac, 0x74, 0xe2, 0x3f, 0x83,
+ 0xd5, 0x09, 0x2b, 0x59, 0x56, 0xaf, 0xe3, 0x23, 0xb0, 0xd1, 0x2d, 0x52, 0x77, 0x47, 0x83, 0xf1,
+ 0x66, 0xdb, 0xd8, 0x65, 0x8d, 0x54, 0x03, 0xfd, 0xa3, 0xb6, 0xfc, 0xbd, 0x13, 0xf9, 0x52, 0x64,
+ 0x0d, 0x97, 0xd5, 0xe2, 0x42, 0xf3, 0x81, 0xc8, 0x74, 0x3f, 0x56, 0xa9, 0x8a, 0xc9, 0xb6, 0x36,
+ 0xaa, 0x1f, 0xd4, 0x9f, 0xd8, 0x10, 0xe6, 0xbf, 0x82, 0xf5, 0x0b, 0xb5, 0xfb, 0x9c, 0xc9, 0x79,
+ 0xc9, 0xc9, 0x13, 0xe8, 0x71, 0xc5, 0x8a, 0x17, 0x5f, 0xab, 0x59, 0x0b, 0xa3, 0x35, 0xd4, 0x7f,
+ 0x6a, 0x7c, 0x7f, 0x10, 0xa9, 0xc0, 0x51, 0x6d, 0x81, 0x9d, 0xe4, 0x91, 0xa8, 0x7d, 0xb7, 0x5a,
+ 0x6e, 0x46, 0x4e, 0x75, 0xfd, 0x85, 0xfb, 0xed, 0xcc, 0xb3, 0x4e, 0xcf, 0x3c, 0xeb, 0xe7, 0x99,
+ 0x67, 0x7d, 0x3d, 0xf7, 0x96, 0x4e, 0xcf, 0xbd, 0xa5, 0x1f, 0xe7, 0xde, 0xd2, 0xd4, 0x51, 0x9f,
+ 0x3c, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x57, 0x93, 0xa7, 0xe2, 0x6e, 0x06, 0x00, 0x00,
}
func (m *Image) Marshal() (dAtA []byte, err error) {
@@ -1218,6 +1226,12 @@
}
i += n15
}
+ if len(m.Feats) > 0 {
+ dAtA[i] = 0x1a
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(len(m.Feats)))
+ i += copy(dAtA[i:], m.Feats)
+ }
return i, nil
}
@@ -1549,6 +1563,10 @@
}
if m.Result != nil {
l = m.Result.Size()
+ n += 1 + l + sovSdk(uint64(l))
+ }
+ l = len(m.Feats)
+ if l > 0 {
n += 1 + l + sovSdk(uint64(l))
}
return n
@@ -2993,6 +3011,40 @@
return err
}
iNdEx = postIndex
+ case 3:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Feats", wireType)
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ byteLen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if byteLen < 0 {
+ return ErrInvalidLengthSdk
+ }
+ postIndex := iNdEx + byteLen
+ if postIndex < 0 {
+ return ErrInvalidLengthSdk
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Feats = append(m.Feats[:0], dAtA[iNdEx:postIndex]...)
+ if m.Feats == nil {
+ m.Feats = []byte{}
+ }
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipSdk(dAtA[iNdEx:])
diff --git a/sdk.proto b/sdk.proto
index d6fdadd..ad0182a 100644
--- a/sdk.proto
+++ b/sdk.proto
@@ -57,7 +57,8 @@
// sdk face property
message ResultFaceDetect{
FacePos pos = 1;
- ThftResult result = 2;
+ ThftResult result = 2;
+ bytes feats = 3;
}
message ParamFacePos{
repeated ResultFaceDetect faces = 1;
--
Gitblit v1.8.0