From 26368e402e46a7bf6a93d0b6634b11277a75d861 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 17 七月 2019 15:15:36 +0800
Subject: [PATCH] add faceid
---
commsg.pb.go | 10 ++
sdk.pb.go | 119 +++++++++++++++++++++++++--------------
sdk.proto | 2
protomsg.pb.go | 10 ++
4 files changed, 95 insertions(+), 46 deletions(-)
diff --git a/commsg.pb.go b/commsg.pb.go
index 41312c6..2866693 100644
--- a/commsg.pb.go
+++ b/commsg.pb.go
@@ -8,7 +8,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.
@@ -579,7 +578,14 @@
}
func sovCommsg(x uint64) (n int) {
- return (math_bits.Len64(x|1) + 6) / 7
+ for {
+ n++
+ x >>= 7
+ if x == 0 {
+ break
+ }
+ }
+ return n
}
func sozCommsg(x uint64) (n int) {
return sovCommsg(uint64((x << 1) ^ uint64((int64(x) >> 63))))
diff --git a/protomsg.pb.go b/protomsg.pb.go
index e98660c..9b6d399 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.
@@ -3698,7 +3697,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 62365a4..2750125 100644
--- a/sdk.pb.go
+++ b/sdk.pb.go
@@ -260,6 +260,7 @@
FAngle *FaceAngle `protobuf:"bytes,6,opt,name=fAngle,proto3" json:"fAngle,omitempty"`
Quality int32 `protobuf:"varint,7,opt,name=quality,proto3" json:"quality,omitempty"`
FacialData []byte `protobuf:"bytes,8,opt,name=facialData,proto3" json:"facialData,omitempty"`
+ FaceID int64 `protobuf:"varint,9,opt,name=faceID,proto3" json:"faceID,omitempty"`
}
func (m *FacePos) Reset() { *m = FacePos{} }
@@ -349,6 +350,13 @@
return m.FacialData
}
return nil
+}
+
+func (m *FacePos) GetFaceID() int64 {
+ if m != nil {
+ return m.FaceID
+ }
+ return 0
}
type FaceInfo struct {
@@ -790,50 +798,50 @@
func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) }
var fileDescriptor_70decb0fb6f436df = []byte{
- // 687 bytes of a gzipped FileDescriptorProto
+ // 686 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,
+ 0x10, 0xad, 0x93, 0x3a, 0x69, 0x26, 0x55, 0x7f, 0xfd, 0x2d, 0x15, 0xb2, 0x2a, 0x14, 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,
+ 0x6e, 0xd6, 0x6b, 0xc7, 0xc5, 0xf6, 0x1a, 0x7b, 0xa3, 0x36, 0xe2, 0x13, 0x70, 0xe3, 0x63, 0x71,
+ 0xec, 0x91, 0x23, 0x6a, 0xe1, 0x7b, 0xa0, 0xd9, 0x5d, 0xd7, 0xae, 0xd4, 0x72, 0xe3, 0xc6, 0x29,
+ 0x33, 0x3b, 0x6f, 0xfd, 0xde, 0x9b, 0xd9, 0x09, 0xf4, 0xca, 0xe0, 0xe3, 0x4e, 0x5e, 0x48, 0x25,
+ 0xc9, 0x8a, 0xfe, 0x49, 0xcb, 0x68, 0x13, 0xa6, 0xac, 0x14, 0xe6, 0xd4, 0xff, 0xe2, 0x80, 0x7b,
+ 0x90, 0xb2, 0x48, 0x90, 0x0d, 0x70, 0x8f, 0xe3, 0x40, 0xcd, 0x3c, 0x67, 0xe8, 0x8c, 0x5c, 0x6a,
+ 0x12, 0x72, 0x13, 0x3a, 0x33, 0x11, 0x47, 0x33, 0xe5, 0xb5, 0xf4, 0xb1, 0xcd, 0x08, 0x81, 0xe5,
+ 0x80, 0x29, 0xe6, 0xb5, 0x87, 0xce, 0x68, 0x95, 0xea, 0x98, 0xdc, 0x82, 0x9e, 0x8a, 0x53, 0x51,
+ 0x2a, 0x96, 0xe6, 0xde, 0xf2, 0xd0, 0x19, 0xf5, 0x68, 0x7d, 0x40, 0xd6, 0xa0, 0x15, 0x07, 0x9e,
+ 0x3b, 0x74, 0x46, 0x6d, 0xda, 0x8a, 0x03, 0xb2, 0x0e, 0x6d, 0x1e, 0x07, 0x5e, 0x47, 0xe3, 0x30,
+ 0xf4, 0x23, 0xe8, 0xed, 0x33, 0x2e, 0x9e, 0x67, 0x51, 0x22, 0xb0, 0xbc, 0x60, 0xc7, 0x56, 0x0c,
+ 0x86, 0x28, 0x30, 0x8f, 0x15, 0x9f, 0x59, 0x25, 0x26, 0x41, 0x21, 0x85, 0x4c, 0x12, 0x2d, 0xc4,
+ 0xa5, 0x3a, 0x26, 0x03, 0x00, 0x2e, 0xb3, 0x30, 0x0e, 0x44, 0xc6, 0x85, 0x56, 0xd2, 0xa2, 0x8d,
+ 0x13, 0xff, 0x04, 0xe0, 0xdd, 0x2c, 0x54, 0x54, 0x94, 0xf3, 0x44, 0xa1, 0xc5, 0x48, 0x64, 0x81,
+ 0x28, 0x2c, 0x99, 0xcd, 0x50, 0x01, 0x8b, 0x84, 0x65, 0xc3, 0x50, 0x73, 0x31, 0x2e, 0x2e, 0xb8,
+ 0x18, 0x17, 0x78, 0x7b, 0x2a, 0xd8, 0x5c, 0x2d, 0x34, 0x8f, 0x4b, 0x6d, 0x86, 0x6a, 0xcb, 0x34,
+ 0x4e, 0x84, 0x76, 0xec, 0x52, 0x93, 0xf8, 0x3f, 0x5b, 0xd0, 0x45, 0x8f, 0x13, 0x59, 0x92, 0xbb,
+ 0xd0, 0x29, 0x38, 0x26, 0x9a, 0xb7, 0x3f, 0x5e, 0xdb, 0xa9, 0x26, 0xb4, 0x43, 0x05, 0x57, 0xd4,
+ 0x56, 0xc9, 0x03, 0xe8, 0xe5, 0xea, 0xb5, 0x08, 0xd5, 0xde, 0xc2, 0xa8, 0xe9, 0x8f, 0xff, 0xab,
+ 0xa1, 0x13, 0x19, 0x67, 0x8a, 0xd6, 0x08, 0xf2, 0x10, 0x20, 0x57, 0x14, 0x87, 0x84, 0xf8, 0xf6,
+ 0xd5, 0xf8, 0x06, 0x84, 0xdc, 0x83, 0x6e, 0xae, 0xde, 0xc8, 0xb9, 0x9a, 0x69, 0x0b, 0x57, 0xa0,
+ 0xab, 0x3a, 0xd9, 0x82, 0x4e, 0xae, 0xde, 0xca, 0xd2, 0xb8, 0xba, 0x02, 0x69, 0xcb, 0xe4, 0x3e,
+ 0x74, 0x42, 0x3d, 0x47, 0x3d, 0xdf, 0xfe, 0xf8, 0x46, 0x0d, 0xbc, 0x18, 0x31, 0xb5, 0x10, 0xe2,
+ 0x41, 0xf7, 0xd3, 0x9c, 0x25, 0xb1, 0x5a, 0x78, 0x5d, 0xdd, 0xac, 0x2a, 0xc5, 0x41, 0x86, 0x8c,
+ 0xc7, 0x2c, 0xd9, 0xc5, 0xb7, 0xb6, 0xa2, 0xdf, 0x5a, 0xe3, 0x04, 0x9b, 0x1f, 0x32, 0x2e, 0x0e,
+ 0x76, 0xbd, 0x9e, 0x7e, 0x57, 0x36, 0xf3, 0x7f, 0xb5, 0x60, 0x05, 0x79, 0x0e, 0xb2, 0x50, 0xfe,
+ 0xeb, 0xf3, 0xdf, 0xeb, 0xf3, 0x7b, 0xe8, 0x1e, 0x4e, 0x8f, 0x74, 0x97, 0xef, 0x80, 0x5b, 0xf0,
+ 0xc3, 0xe9, 0xd1, 0x35, 0x4d, 0x36, 0x45, 0xdc, 0x29, 0xb5, 0xc8, 0xab, 0x9d, 0x52, 0x8b, 0x1c,
+ 0x77, 0x2a, 0x2f, 0xe4, 0x54, 0x37, 0xb0, 0x45, 0x75, 0xec, 0x7f, 0x86, 0x75, 0xb3, 0x9b, 0xe8,
+ 0x61, 0x57, 0x28, 0xc1, 0x15, 0xb9, 0x0d, 0xed, 0x5c, 0x96, 0xf6, 0xeb, 0xff, 0x5f, 0xb6, 0x39,
+ 0x91, 0x25, 0xc5, 0x2a, 0xd9, 0x86, 0x4e, 0xa1, 0x2f, 0xda, 0xf9, 0x6d, 0xd4, 0xb8, 0x7a, 0xe1,
+ 0xa9, 0xc5, 0xe0, 0x8a, 0x86, 0x82, 0xa9, 0xd2, 0xfe, 0x89, 0x99, 0xc4, 0x7f, 0x06, 0xab, 0x13,
+ 0x56, 0xb0, 0xb4, 0x5a, 0xd3, 0x47, 0xe0, 0xa2, 0x5b, 0xa4, 0x6e, 0x8f, 0xfa, 0xe3, 0xcd, 0xa6,
+ 0xb1, 0xcb, 0x1a, 0xa9, 0x01, 0xfa, 0x47, 0x4d, 0xf9, 0x7b, 0x27, 0xea, 0xa5, 0x4c, 0x6b, 0x2e,
+ 0xa7, 0xc1, 0x85, 0xe6, 0xb9, 0x4c, 0x4d, 0x3f, 0x56, 0xa9, 0x8e, 0xc9, 0xb6, 0x31, 0x6a, 0x1e,
+ 0xd4, 0x9f, 0xd8, 0x10, 0xe6, 0xbf, 0x82, 0xf5, 0x0b, 0xb5, 0xfb, 0x82, 0xa9, 0x79, 0x21, 0xc8,
+ 0x13, 0xe8, 0x0a, 0xcd, 0x8a, 0x1f, 0xbe, 0x56, 0xb3, 0x11, 0x46, 0x2b, 0xa8, 0xff, 0xd4, 0xfa,
+ 0xfe, 0x20, 0x13, 0x89, 0xa3, 0xda, 0x02, 0x37, 0xce, 0x42, 0x59, 0xf9, 0x6e, 0xb4, 0xdc, 0x8e,
+ 0x9c, 0x9a, 0xfa, 0x0b, 0xef, 0xdb, 0xd9, 0xc0, 0x39, 0x3d, 0x1b, 0x38, 0x3f, 0xce, 0x06, 0xce,
+ 0xd7, 0xf3, 0xc1, 0xd2, 0xe9, 0xf9, 0x60, 0xe9, 0xfb, 0xf9, 0x60, 0x69, 0xda, 0xd1, 0x57, 0x1e,
+ 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x92, 0xe2, 0xba, 0x86, 0x06, 0x00, 0x00,
}
func (m *Image) Marshal() (dAtA []byte, err error) {
@@ -1054,6 +1062,11 @@
i++
i = encodeVarintSdk(dAtA, i, uint64(len(m.FacialData)))
i += copy(dAtA[i:], m.FacialData)
+ }
+ if m.FaceID != 0 {
+ dAtA[i] = 0x48
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(m.FaceID))
}
return i, nil
}
@@ -1485,6 +1498,9 @@
l = len(m.FacialData)
if l > 0 {
n += 1 + l + sovSdk(uint64(l))
+ }
+ if m.FaceID != 0 {
+ n += 1 + sovSdk(uint64(m.FaceID))
}
return n
}
@@ -2426,6 +2442,25 @@
m.FacialData = []byte{}
}
iNdEx = postIndex
+ case 9:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field FaceID", wireType)
+ }
+ m.FaceID = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.FaceID |= int64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipSdk(dAtA[iNdEx:])
diff --git a/sdk.proto b/sdk.proto
index ad0182a..279c9d9 100644
--- a/sdk.proto
+++ b/sdk.proto
@@ -36,6 +36,8 @@
FaceAngle fAngle = 6;
int32 quality = 7;
bytes facialData = 8;
+
+ int64 faceID = 9;
}
message FaceInfo{
Rect rcFace = 1;
--
Gitblit v1.8.0