From 0ed380733e48c403e258349cd0246f50e6875b54 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 22 六月 2019 09:42:47 +0800
Subject: [PATCH] add camera run state
---
sdk.pb.go | 173 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 130 insertions(+), 43 deletions(-)
diff --git a/sdk.pb.go b/sdk.pb.go
index fc9c4ac..bf112d9 100644
--- a/sdk.pb.go
+++ b/sdk.pb.go
@@ -24,9 +24,11 @@
// Image ipc struct
type Image struct {
- Width int32 `protobuf:"varint,1,opt,name=width,proto3" json:"width,omitempty"`
- Height int32 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
- Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+ Width int32 `protobuf:"varint,1,opt,name=width,proto3" json:"width,omitempty"`
+ Height int32 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
+ Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+ Timestamp string `protobuf:"bytes,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+ Id int64 `protobuf:"varint,5,opt,name=id,proto3" json:"id,omitempty"`
}
func (m *Image) Reset() { *m = Image{} }
@@ -81,6 +83,20 @@
return m.Data
}
return nil
+}
+
+func (m *Image) GetTimestamp() string {
+ if m != nil {
+ return m.Timestamp
+ }
+ return ""
+}
+
+func (m *Image) GetId() int64 {
+ if m != nil {
+ return m.Id
+ }
+ return 0
}
type FaceAngle struct {
@@ -751,46 +767,48 @@
func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) }
var fileDescriptor_70decb0fb6f436df = []byte{
- // 624 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x54, 0x4d, 0x6f, 0xd3, 0x4c,
- 0x10, 0xae, 0x93, 0xda, 0x69, 0xa6, 0xd5, 0xfb, 0x96, 0xa5, 0x42, 0x56, 0x0f, 0x56, 0x64, 0x10,
- 0x35, 0x02, 0x0a, 0x0d, 0x07, 0x6e, 0x88, 0x8f, 0x52, 0xa9, 0x12, 0xd0, 0x68, 0x05, 0x07, 0x8e,
- 0x6b, 0x67, 0xfd, 0x51, 0x1c, 0xaf, 0xb1, 0x37, 0x2a, 0xfe, 0x17, 0xfc, 0x2c, 0x0e, 0x1c, 0x7a,
- 0xe4, 0x88, 0x5a, 0xf1, 0x3f, 0xd0, 0xec, 0xae, 0x6b, 0x57, 0x0a, 0x27, 0xae, 0x9c, 0x32, 0xcf,
- 0xcc, 0xe3, 0xf9, 0x78, 0x66, 0x27, 0x30, 0xae, 0xe7, 0x9f, 0xf6, 0xcb, 0x4a, 0x48, 0x41, 0x36,
- 0xd4, 0xcf, 0xa2, 0x4e, 0x76, 0x21, 0x64, 0x35, 0xd7, 0x5e, 0xff, 0x18, 0xec, 0xe3, 0x05, 0x4b,
- 0x38, 0xd9, 0x01, 0xfb, 0x2c, 0x9b, 0xcb, 0xd4, 0xb5, 0x26, 0x56, 0x60, 0x53, 0x0d, 0xc8, 0x2d,
- 0x70, 0x52, 0x9e, 0x25, 0xa9, 0x74, 0x07, 0xca, 0x6d, 0x10, 0x21, 0xb0, 0x3e, 0x67, 0x92, 0xb9,
- 0xc3, 0x89, 0x15, 0x6c, 0x51, 0x65, 0xfb, 0x09, 0x8c, 0x8f, 0x58, 0xc4, 0x5f, 0x14, 0x49, 0xce,
- 0xc9, 0x36, 0x0c, 0x1b, 0x76, 0x66, 0x92, 0xa1, 0x89, 0x05, 0xca, 0x4c, 0x46, 0xa9, 0xc9, 0xa4,
- 0x01, 0x26, 0xaa, 0x44, 0x9e, 0xab, 0x44, 0x36, 0x55, 0x36, 0xf1, 0x00, 0x22, 0x51, 0xc4, 0xd9,
- 0x9c, 0x17, 0x11, 0x77, 0xd7, 0x27, 0x56, 0x30, 0xa0, 0x3d, 0x8f, 0xff, 0x05, 0xe0, 0x7d, 0x1a,
- 0x4b, 0xca, 0xeb, 0x65, 0x2e, 0xb1, 0xc5, 0x84, 0x17, 0x73, 0x5e, 0x99, 0x62, 0x06, 0x61, 0x07,
- 0x2c, 0xe1, 0xa6, 0x1a, 0x9a, 0xaa, 0x16, 0x8b, 0xf8, 0x55, 0x2d, 0x16, 0x71, 0xfc, 0x3a, 0xe4,
- 0x6c, 0x29, 0x1b, 0x55, 0xc7, 0xa6, 0x06, 0x61, 0xb7, 0xf5, 0x22, 0xcb, 0xb9, 0x6b, 0xeb, 0x6e,
- 0x15, 0xf0, 0xbf, 0x0f, 0x60, 0x84, 0x33, 0xce, 0x44, 0x4d, 0xee, 0x82, 0x53, 0x45, 0x08, 0x54,
- 0xdd, 0xcd, 0xe9, 0x7f, 0xfb, 0xad, 0xc0, 0xfb, 0x94, 0x47, 0x92, 0x9a, 0x28, 0x79, 0x08, 0xe3,
- 0x52, 0xbe, 0xe1, 0xb1, 0x7c, 0xdd, 0xe8, 0x6e, 0x36, 0xa7, 0xff, 0x77, 0xd4, 0x99, 0xc8, 0x0a,
- 0x49, 0x3b, 0x06, 0x79, 0x04, 0x50, 0x4a, 0x8a, 0x22, 0x23, 0x7f, 0xb8, 0x9a, 0xdf, 0xa3, 0x90,
- 0x7b, 0x30, 0x2a, 0xe5, 0x5b, 0xb1, 0x94, 0xa9, 0x1a, 0x61, 0x05, 0xbb, 0x8d, 0x93, 0x3d, 0x70,
- 0x4a, 0xf9, 0x4e, 0xd4, 0x7a, 0xaa, 0x15, 0x4c, 0x13, 0x26, 0xf7, 0xc1, 0x89, 0xd5, 0x1e, 0x5d,
- 0x47, 0x11, 0x6f, 0x76, 0xc4, 0xab, 0x15, 0x53, 0x43, 0x21, 0x2e, 0x8c, 0x3e, 0x2f, 0x59, 0x9e,
- 0xc9, 0xc6, 0x1d, 0x29, 0xb1, 0x5a, 0x88, 0x8b, 0x8c, 0x59, 0x94, 0xb1, 0xfc, 0x10, 0xdf, 0xca,
- 0x86, 0x7a, 0x2b, 0x3d, 0x8f, 0xff, 0x6b, 0x00, 0x1b, 0x98, 0xef, 0xb8, 0x88, 0xc5, 0x3f, 0x3d,
- 0xff, 0x5a, 0x4f, 0x7c, 0xcc, 0x31, 0xca, 0x79, 0xe8, 0x8e, 0x27, 0x56, 0x30, 0xa4, 0x06, 0xf9,
- 0x1f, 0x60, 0x74, 0x12, 0x9e, 0x2a, 0x95, 0xef, 0x80, 0x5d, 0x45, 0x27, 0xe1, 0xe9, 0x1f, 0x44,
- 0xd6, 0x41, 0xbc, 0x1d, 0xd9, 0x94, 0xed, 0xed, 0xc8, 0xa6, 0xc4, 0xdb, 0x29, 0x2b, 0x11, 0x2a,
- 0x01, 0x07, 0x54, 0xd9, 0x3e, 0x87, 0x6d, 0x7d, 0x83, 0x38, 0xc3, 0x21, 0x97, 0x3c, 0x92, 0xe4,
- 0x36, 0x0c, 0x4b, 0x51, 0x9b, 0xec, 0x37, 0xae, 0x8f, 0x39, 0x13, 0x35, 0xc5, 0x28, 0x79, 0x00,
- 0x4e, 0xa5, 0x3e, 0x34, 0xfb, 0xdb, 0xe9, 0x78, 0xdd, 0x61, 0x53, 0xc3, 0xf1, 0x9f, 0xc3, 0xd6,
- 0x8c, 0x55, 0x6c, 0xd1, 0x1e, 0xde, 0x63, 0xb0, 0x71, 0x2e, 0x2c, 0x32, 0x0c, 0x36, 0xa7, 0xbb,
- 0xfd, 0x11, 0xae, 0x77, 0x43, 0x35, 0xd1, 0x0f, 0x60, 0xfb, 0x2a, 0xc3, 0x11, 0x67, 0x72, 0x59,
- 0xa9, 0xff, 0xbb, 0x98, 0x33, 0xa9, 0xb3, 0x6c, 0x51, 0x0d, 0xfc, 0x67, 0x3d, 0xe6, 0x2b, 0xb1,
- 0x28, 0x59, 0xc7, 0x3c, 0x50, 0x43, 0x19, 0xe6, 0x41, 0xeb, 0x9d, 0xaa, 0x11, 0x8c, 0x77, 0xea,
- 0x3f, 0x35, 0xbd, 0x7e, 0x14, 0xb9, 0x40, 0x21, 0xf7, 0xc0, 0xce, 0x8a, 0x58, 0xb4, 0xbd, 0xf6,
- 0x04, 0x31, 0x0b, 0xa1, 0x3a, 0xfe, 0xd2, 0xfd, 0x76, 0xe1, 0x59, 0xe7, 0x17, 0x9e, 0xf5, 0xf3,
- 0xc2, 0xb3, 0xbe, 0x5e, 0x7a, 0x6b, 0xe7, 0x97, 0xde, 0xda, 0x8f, 0x4b, 0x6f, 0x2d, 0x74, 0xd4,
- 0x27, 0x4f, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xba, 0xd3, 0x09, 0x2b, 0xcb, 0x05, 0x00, 0x00,
+ // 650 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x54, 0x4f, 0x6f, 0xd3, 0x4e,
+ 0x10, 0xad, 0x9d, 0xda, 0x69, 0xa6, 0x55, 0x7f, 0xfd, 0x2d, 0x15, 0xb2, 0x2a, 0x64, 0x45, 0x06,
+ 0xd1, 0x20, 0xa0, 0xd0, 0x70, 0xe0, 0x86, 0xf8, 0x53, 0x2a, 0x55, 0x02, 0x1a, 0xad, 0xe0, 0xc0,
+ 0x71, 0x63, 0xaf, 0x1d, 0x17, 0xdb, 0x6b, 0xec, 0x89, 0x4a, 0xbe, 0x05, 0x1f, 0x8b, 0x03, 0x87,
+ 0x1e, 0x39, 0xa2, 0x56, 0x7c, 0x0f, 0xb4, 0xe3, 0x75, 0x9d, 0x4a, 0xe5, 0xc4, 0x95, 0x53, 0xf6,
+ 0xcd, 0x3c, 0xef, 0x9b, 0x37, 0xb3, 0x13, 0x18, 0xd4, 0xd1, 0xa7, 0xbd, 0xb2, 0x52, 0xa8, 0xd8,
+ 0x1a, 0xfd, 0xe4, 0x75, 0xb2, 0x03, 0x53, 0x51, 0xcb, 0x26, 0x1a, 0x9c, 0x82, 0x73, 0x94, 0x8b,
+ 0x44, 0xb2, 0x6d, 0x70, 0x4e, 0xd3, 0x08, 0x67, 0x9e, 0x35, 0xb4, 0x46, 0x0e, 0x6f, 0x00, 0xbb,
+ 0x09, 0xee, 0x4c, 0xa6, 0xc9, 0x0c, 0x3d, 0x9b, 0xc2, 0x06, 0x31, 0x06, 0xab, 0x91, 0x40, 0xe1,
+ 0xf5, 0x86, 0xd6, 0x68, 0x83, 0xd3, 0x99, 0xdd, 0x82, 0x01, 0xa6, 0xb9, 0xac, 0x51, 0xe4, 0xa5,
+ 0xb7, 0x3a, 0xb4, 0x46, 0x03, 0xde, 0x05, 0xd8, 0x26, 0xd8, 0x69, 0xe4, 0x39, 0x43, 0x6b, 0xd4,
+ 0xe3, 0x76, 0x1a, 0x05, 0x09, 0x0c, 0x0e, 0x45, 0x28, 0x5f, 0x14, 0x49, 0x26, 0xd9, 0x16, 0xf4,
+ 0x16, 0xe2, 0xd4, 0x48, 0xeb, 0xa3, 0x2e, 0xa7, 0x4c, 0x31, 0x9c, 0x19, 0xdd, 0x06, 0x68, 0xd9,
+ 0x4a, 0x65, 0x19, 0xc9, 0x3a, 0x9c, 0xce, 0xcc, 0x07, 0x08, 0x55, 0x11, 0xa7, 0x91, 0x2c, 0x42,
+ 0x49, 0xba, 0x36, 0x5f, 0x8a, 0x04, 0x5f, 0x00, 0xde, 0xcf, 0x62, 0xe4, 0xb2, 0x9e, 0x67, 0xa8,
+ 0x0d, 0x25, 0xb2, 0x88, 0x64, 0x65, 0xc4, 0x0c, 0xd2, 0x15, 0x88, 0x44, 0x1a, 0x35, 0x7d, 0x24,
+ 0x2d, 0x11, 0xca, 0x4b, 0x2d, 0x11, 0x4a, 0xfd, 0xf5, 0x54, 0x8a, 0x39, 0x2e, 0x48, 0xc7, 0xe1,
+ 0x06, 0xe9, 0x6a, 0xeb, 0x3c, 0xcd, 0x24, 0xf9, 0x73, 0x78, 0x03, 0x82, 0xef, 0x36, 0xf4, 0xb5,
+ 0xc7, 0x89, 0xaa, 0xd9, 0x5d, 0x70, 0xab, 0x50, 0x03, 0xd2, 0x5d, 0x1f, 0x6f, 0xee, 0xb5, 0xe3,
+ 0xd8, 0xe3, 0x32, 0x44, 0x6e, 0xb2, 0xec, 0x21, 0x0c, 0x4a, 0x7c, 0x23, 0x63, 0x7c, 0xbd, 0x68,
+ 0xaa, 0x59, 0x1f, 0xff, 0xd7, 0x51, 0x27, 0x2a, 0x2d, 0x90, 0x77, 0x0c, 0xf6, 0x08, 0xa0, 0x44,
+ 0xae, 0x47, 0xa2, 0xf9, 0xbd, 0xeb, 0xf9, 0x4b, 0x14, 0x76, 0x0f, 0xfa, 0x25, 0xbe, 0x55, 0x73,
+ 0x9c, 0x91, 0x85, 0x6b, 0xd8, 0x6d, 0x9e, 0xed, 0x82, 0x5b, 0xe2, 0x3b, 0x55, 0x37, 0xae, 0xae,
+ 0x61, 0x9a, 0x34, 0xbb, 0x0f, 0x6e, 0x4c, 0x73, 0xf4, 0x5c, 0x22, 0xde, 0xe8, 0x88, 0x97, 0x23,
+ 0xe6, 0x86, 0xc2, 0x3c, 0xe8, 0x7f, 0x9e, 0x8b, 0x2c, 0xc5, 0x85, 0xd7, 0xa7, 0x66, 0xb5, 0x50,
+ 0x0f, 0x32, 0x16, 0x61, 0x2a, 0xb2, 0x03, 0xfd, 0xb2, 0xd6, 0xe8, 0x65, 0x2d, 0x45, 0x82, 0x5f,
+ 0x36, 0xac, 0xe9, 0xfb, 0x8e, 0x8a, 0x58, 0xfd, 0xeb, 0xe7, 0x5f, 0xf7, 0x53, 0x3f, 0xe6, 0x58,
+ 0xb7, 0xf3, 0xc0, 0x1b, 0xd0, 0x56, 0x1a, 0x14, 0x7c, 0x80, 0xfe, 0xf1, 0xf4, 0x84, 0xba, 0x7c,
+ 0x07, 0x9c, 0x2a, 0x3c, 0x9e, 0x9e, 0xfc, 0xa1, 0xc9, 0x4d, 0x52, 0xef, 0x0e, 0x2e, 0xca, 0x76,
+ 0x77, 0x70, 0x51, 0xea, 0xdd, 0x29, 0x2b, 0x35, 0xa5, 0x06, 0xda, 0x9c, 0xce, 0x81, 0x84, 0xad,
+ 0x66, 0x07, 0xb5, 0x87, 0x03, 0x89, 0x32, 0x44, 0x76, 0x1b, 0x7a, 0xa5, 0xaa, 0xcd, 0xed, 0xff,
+ 0x5f, 0xb5, 0x39, 0x51, 0x35, 0xd7, 0x59, 0xf6, 0x00, 0xdc, 0x8a, 0x3e, 0x34, 0xf3, 0xdb, 0xee,
+ 0x78, 0xdd, 0x62, 0x73, 0xc3, 0x09, 0x9e, 0xc3, 0xc6, 0x44, 0x54, 0x22, 0x6f, 0x17, 0xef, 0x31,
+ 0x38, 0xda, 0x97, 0x16, 0xe9, 0x8d, 0xd6, 0xc7, 0x3b, 0xcb, 0x16, 0xae, 0x56, 0xc3, 0x1b, 0x62,
+ 0x30, 0x82, 0xad, 0xcb, 0x1b, 0x0e, 0xa5, 0xc0, 0x79, 0x45, 0xff, 0x8e, 0xb1, 0x14, 0xd8, 0xdc,
+ 0xb2, 0xc1, 0x1b, 0x10, 0x3c, 0x5b, 0x62, 0xbe, 0x52, 0x79, 0x29, 0x3a, 0xe6, 0x3e, 0x99, 0x32,
+ 0xcc, 0xfd, 0x36, 0x3a, 0x26, 0x0b, 0x26, 0x3a, 0x0e, 0x9e, 0x9a, 0x5a, 0x3f, 0xaa, 0x4c, 0xe9,
+ 0x46, 0xee, 0x82, 0x93, 0x16, 0xb1, 0x6a, 0x6b, 0x5d, 0x6a, 0x88, 0x19, 0x08, 0x6f, 0xf2, 0x2f,
+ 0xbd, 0x6f, 0xe7, 0xbe, 0x75, 0x76, 0xee, 0x5b, 0x3f, 0xcf, 0x7d, 0xeb, 0xeb, 0x85, 0xbf, 0x72,
+ 0x76, 0xe1, 0xaf, 0xfc, 0xb8, 0xf0, 0x57, 0xa6, 0x2e, 0x7d, 0xf2, 0xe4, 0x77, 0x00, 0x00, 0x00,
+ 0xff, 0xff, 0x2b, 0x51, 0xd4, 0x7a, 0xf9, 0x05, 0x00, 0x00,
}
func (m *Image) Marshal() (dAtA []byte, err error) {
@@ -823,6 +841,17 @@
i++
i = encodeVarintSdk(dAtA, i, uint64(len(m.Data)))
i += copy(dAtA[i:], m.Data)
+ }
+ if len(m.Timestamp) > 0 {
+ dAtA[i] = 0x22
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(len(m.Timestamp)))
+ i += copy(dAtA[i:], m.Timestamp)
+ }
+ if m.Id != 0 {
+ dAtA[i] = 0x28
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(m.Id))
}
return i, nil
}
@@ -1310,6 +1339,13 @@
if l > 0 {
n += 1 + l + sovSdk(uint64(l))
}
+ l = len(m.Timestamp)
+ if l > 0 {
+ n += 1 + l + sovSdk(uint64(l))
+ }
+ if m.Id != 0 {
+ n += 1 + sovSdk(uint64(m.Id))
+ }
return n
}
@@ -1653,6 +1689,57 @@
m.Data = []byte{}
}
iNdEx = postIndex
+ case 4:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ stringLen |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ intStringLen := int(stringLen)
+ if intStringLen < 0 {
+ return ErrInvalidLengthSdk
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthSdk
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Timestamp = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 5:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
+ }
+ m.Id = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.Id |= int64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipSdk(dAtA[iNdEx:])
--
Gitblit v1.8.0