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 | 355 +++++++++++++++++++++++++++------------------------------- 1 files changed, 166 insertions(+), 189 deletions(-) diff --git a/sdk.pb.go b/sdk.pb.go index fdf6249..bf112d9 100644 --- a/sdk.pb.go +++ b/sdk.pb.go @@ -6,7 +6,7 @@ import ( encoding_binary "encoding/binary" fmt "fmt" - proto "github.com/golang/protobuf/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" ) @@ -20,16 +20,15 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package // 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"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + 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{} } @@ -86,14 +85,25 @@ 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 { - Yaw int32 `protobuf:"varint,1,opt,name=yaw,proto3" json:"yaw,omitempty"` - Pitch int32 `protobuf:"varint,2,opt,name=pitch,proto3" json:"pitch,omitempty"` - Roll int32 `protobuf:"varint,3,opt,name=roll,proto3" json:"roll,omitempty"` - Confidence float32 `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Yaw int32 `protobuf:"varint,1,opt,name=yaw,proto3" json:"yaw,omitempty"` + Pitch int32 `protobuf:"varint,2,opt,name=pitch,proto3" json:"pitch,omitempty"` + Roll int32 `protobuf:"varint,3,opt,name=roll,proto3" json:"roll,omitempty"` + Confidence float32 `protobuf:"fixed32,4,opt,name=confidence,proto3" json:"confidence,omitempty"` } func (m *FaceAngle) Reset() { *m = FaceAngle{} } @@ -158,14 +168,11 @@ } type ThftResult struct { - Gender int32 `protobuf:"varint,1,opt,name=gender,proto3" json:"gender,omitempty"` - Age int32 `protobuf:"varint,2,opt,name=age,proto3" json:"age,omitempty"` - Race int32 `protobuf:"varint,3,opt,name=race,proto3" json:"race,omitempty"` - Beauty int32 `protobuf:"varint,4,opt,name=beauty,proto3" json:"beauty,omitempty"` - Smile int32 `protobuf:"varint,5,opt,name=smile,proto3" json:"smile,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Gender int32 `protobuf:"varint,1,opt,name=gender,proto3" json:"gender,omitempty"` + Age int32 `protobuf:"varint,2,opt,name=age,proto3" json:"age,omitempty"` + Race int32 `protobuf:"varint,3,opt,name=race,proto3" json:"race,omitempty"` + Beauty int32 `protobuf:"varint,4,opt,name=beauty,proto3" json:"beauty,omitempty"` + Smile int32 `protobuf:"varint,5,opt,name=smile,proto3" json:"smile,omitempty"` } func (m *ThftResult) Reset() { *m = ThftResult{} } @@ -237,17 +244,14 @@ } type FacePos struct { - RcFace *Rect `protobuf:"bytes,1,opt,name=rcFace,proto3" json:"rcFace,omitempty"` - PtLeftEye *Point `protobuf:"bytes,2,opt,name=ptLeftEye,proto3" json:"ptLeftEye,omitempty"` - PtRightEye *Point `protobuf:"bytes,3,opt,name=ptRightEye,proto3" json:"ptRightEye,omitempty"` - PtMouth *Point `protobuf:"bytes,4,opt,name=ptMouth,proto3" json:"ptMouth,omitempty"` - PtNose *Point `protobuf:"bytes,5,opt,name=ptNose,proto3" json:"ptNose,omitempty"` - 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"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RcFace *Rect `protobuf:"bytes,1,opt,name=rcFace,proto3" json:"rcFace,omitempty"` + PtLeftEye *Point `protobuf:"bytes,2,opt,name=ptLeftEye,proto3" json:"ptLeftEye,omitempty"` + PtRightEye *Point `protobuf:"bytes,3,opt,name=ptRightEye,proto3" json:"ptRightEye,omitempty"` + PtMouth *Point `protobuf:"bytes,4,opt,name=ptMouth,proto3" json:"ptMouth,omitempty"` + PtNose *Point `protobuf:"bytes,5,opt,name=ptNose,proto3" json:"ptNose,omitempty"` + 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"` } func (m *FacePos) Reset() { *m = FacePos{} } @@ -340,18 +344,15 @@ } type FaceInfo struct { - RcFace *Rect `protobuf:"bytes,1,opt,name=rcFace,proto3" json:"rcFace,omitempty"` - PtLeftEye *Point `protobuf:"bytes,2,opt,name=ptLeftEye,proto3" json:"ptLeftEye,omitempty"` - PtRightEye *Point `protobuf:"bytes,3,opt,name=ptRightEye,proto3" json:"ptRightEye,omitempty"` - PtMouth *Point `protobuf:"bytes,4,opt,name=ptMouth,proto3" json:"ptMouth,omitempty"` - PtNose *Point `protobuf:"bytes,5,opt,name=ptNose,proto3" json:"ptNose,omitempty"` - 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"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RcFace *Rect `protobuf:"bytes,1,opt,name=rcFace,proto3" json:"rcFace,omitempty"` + PtLeftEye *Point `protobuf:"bytes,2,opt,name=ptLeftEye,proto3" json:"ptLeftEye,omitempty"` + PtRightEye *Point `protobuf:"bytes,3,opt,name=ptRightEye,proto3" json:"ptRightEye,omitempty"` + PtMouth *Point `protobuf:"bytes,4,opt,name=ptMouth,proto3" json:"ptMouth,omitempty"` + PtNose *Point `protobuf:"bytes,5,opt,name=ptNose,proto3" json:"ptNose,omitempty"` + 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 *FaceInfo) Reset() { *m = FaceInfo{} } @@ -451,12 +452,9 @@ } type ObjInfo struct { - RcObj *Rect `protobuf:"bytes,1,opt,name=rcObj,proto3" json:"rcObj,omitempty"` - Typ int32 `protobuf:"varint,2,opt,name=typ,proto3" json:"typ,omitempty"` - Prob float32 `protobuf:"fixed32,3,opt,name=prob,proto3" json:"prob,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RcObj *Rect `protobuf:"bytes,1,opt,name=rcObj,proto3" json:"rcObj,omitempty"` + Typ int32 `protobuf:"varint,2,opt,name=typ,proto3" json:"typ,omitempty"` + Prob float32 `protobuf:"fixed32,3,opt,name=prob,proto3" json:"prob,omitempty"` } func (m *ObjInfo) Reset() { *m = ObjInfo{} } @@ -515,11 +513,8 @@ // sdk face property 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"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Pos *FacePos `protobuf:"bytes,1,opt,name=pos,proto3" json:"pos,omitempty"` + Result *ThftResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"` } func (m *ResultFaceDetect) Reset() { *m = ResultFaceDetect{} } @@ -570,10 +565,7 @@ } type ParamFacePos struct { - Faces []*ResultFaceDetect `protobuf:"bytes,1,rep,name=faces,proto3" json:"faces,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Faces []*ResultFaceDetect `protobuf:"bytes,1,rep,name=faces,proto3" json:"faces,omitempty"` } func (m *ParamFacePos) Reset() { *m = ParamFacePos{} } @@ -617,10 +609,7 @@ } type ParamFaceFeature struct { - Feats [][]byte `protobuf:"bytes,1,rep,name=feats,proto3" json:"feats,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Feats [][]byte `protobuf:"bytes,1,rep,name=feats,proto3" json:"feats,omitempty"` } func (m *ParamFaceFeature) Reset() { *m = ParamFaceFeature{} } @@ -665,11 +654,8 @@ // sdk face extract type ParamFaceCompare struct { - Feat1 []byte `protobuf:"bytes,1,opt,name=feat1,proto3" json:"feat1,omitempty"` - Feat2 []byte `protobuf:"bytes,2,opt,name=feat2,proto3" json:"feat2,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Feat1 []byte `protobuf:"bytes,1,opt,name=feat1,proto3" json:"feat1,omitempty"` + Feat2 []byte `protobuf:"bytes,2,opt,name=feat2,proto3" json:"feat2,omitempty"` } func (m *ParamFaceCompare) Reset() { *m = ParamFaceCompare{} } @@ -721,10 +707,7 @@ // sdk yolo detect type ParamYoloObj struct { - Infos []*ObjInfo `protobuf:"bytes,1,rep,name=infos,proto3" json:"infos,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Infos []*ObjInfo `protobuf:"bytes,1,rep,name=infos,proto3" json:"infos,omitempty"` } func (m *ParamYoloObj) Reset() { *m = ParamYoloObj{} } @@ -784,46 +767,48 @@ func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) } var fileDescriptor_70decb0fb6f436df = []byte{ - // 615 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x54, 0x4d, 0x6f, 0xd3, 0x4c, - 0x10, 0x7e, 0x1d, 0xd7, 0x4e, 0x33, 0xad, 0x5e, 0xc2, 0x52, 0x21, 0xab, 0x87, 0x28, 0x32, 0x88, - 0x1a, 0x01, 0x85, 0x86, 0x03, 0x37, 0xc4, 0x47, 0xa9, 0x54, 0x09, 0x68, 0xb4, 0x82, 0x03, 0xc7, - 0xb5, 0xb3, 0xfe, 0x28, 0x8e, 0xd7, 0xd8, 0x1b, 0x15, 0xff, 0x13, 0x7e, 0x12, 0x07, 0x0e, 0xfc, - 0x04, 0x54, 0xc4, 0xff, 0x40, 0xb3, 0xbb, 0x8e, 0x5d, 0x29, 0x9c, 0xb8, 0x72, 0xca, 0x3c, 0x33, - 0x8f, 0xe7, 0xe3, 0x99, 0x9d, 0xc0, 0xa8, 0x5e, 0x7c, 0x3c, 0x2c, 0x2b, 0x21, 0x05, 0xd9, 0x56, - 0x3f, 0xcb, 0x3a, 0xd9, 0x87, 0x90, 0xd5, 0x5c, 0x7b, 0xfd, 0x53, 0x70, 0x4e, 0x97, 0x2c, 0xe1, - 0x64, 0x0f, 0x9c, 0x8b, 0x6c, 0x21, 0x53, 0xcf, 0x9a, 0x5a, 0x81, 0x43, 0x35, 0x20, 0x37, 0xc1, - 0x4d, 0x79, 0x96, 0xa4, 0xd2, 0x1b, 0x28, 0xb7, 0x41, 0x84, 0xc0, 0xd6, 0x82, 0x49, 0xe6, 0xd9, - 0x53, 0x2b, 0xd8, 0xa5, 0xca, 0xf6, 0x13, 0x18, 0x9d, 0xb0, 0x88, 0x3f, 0x2f, 0x92, 0x9c, 0x93, - 0x31, 0xd8, 0x0d, 0xbb, 0x30, 0xc9, 0xd0, 0xc4, 0x02, 0x65, 0x26, 0xa3, 0xd4, 0x64, 0xd2, 0x00, - 0x13, 0x55, 0x22, 0xcf, 0x55, 0x22, 0x87, 0x2a, 0x9b, 0x4c, 0x00, 0x22, 0x51, 0xc4, 0xd9, 0x82, - 0x17, 0x11, 0xf7, 0xb6, 0xa6, 0x56, 0x30, 0xa0, 0x3d, 0x8f, 0xff, 0x19, 0xe0, 0x5d, 0x1a, 0x4b, - 0xca, 0xeb, 0x55, 0x2e, 0xb1, 0xc5, 0x84, 0x17, 0x0b, 0x5e, 0x99, 0x62, 0x06, 0x61, 0x07, 0x2c, - 0xe1, 0xa6, 0x1a, 0x9a, 0xaa, 0x16, 0x8b, 0xf8, 0xba, 0x16, 0x8b, 0x38, 0x7e, 0x1d, 0x72, 0xb6, - 0x92, 0x8d, 0xaa, 0xe3, 0x50, 0x83, 0xb0, 0xdb, 0x7a, 0x99, 0xe5, 0xdc, 0x73, 0x74, 0xb7, 0x0a, - 0xf8, 0xdf, 0x06, 0x30, 0xc4, 0x19, 0xe7, 0xa2, 0x26, 0x77, 0xc0, 0xad, 0x22, 0x04, 0xaa, 0xee, - 0xce, 0xec, 0xff, 0xc3, 0x56, 0xe0, 0x43, 0xca, 0x23, 0x49, 0x4d, 0x94, 0x3c, 0x80, 0x51, 0x29, - 0x5f, 0xf3, 0x58, 0xbe, 0x6a, 0x74, 0x37, 0x3b, 0xb3, 0x6b, 0x1d, 0x75, 0x2e, 0xb2, 0x42, 0xd2, - 0x8e, 0x41, 0x1e, 0x02, 0x94, 0x92, 0xa2, 0xc8, 0xc8, 0xb7, 0x37, 0xf3, 0x7b, 0x14, 0x72, 0x17, - 0x86, 0xa5, 0x7c, 0x23, 0x56, 0x32, 0x55, 0x23, 0x6c, 0x60, 0xb7, 0x71, 0x72, 0x00, 0x6e, 0x29, - 0xdf, 0x8a, 0x5a, 0x4f, 0xb5, 0x81, 0x69, 0xc2, 0xe4, 0x1e, 0xb8, 0xb1, 0xda, 0xa3, 0xe7, 0x2a, - 0xe2, 0x8d, 0x8e, 0xb8, 0x5e, 0x31, 0x35, 0x14, 0xe2, 0xc1, 0xf0, 0xd3, 0x8a, 0xe5, 0x99, 0x6c, - 0xbc, 0xa1, 0x12, 0xab, 0x85, 0xb8, 0xc8, 0x98, 0x45, 0x19, 0xcb, 0x8f, 0xf1, 0xad, 0x6c, 0xab, - 0xb7, 0xd2, 0xf3, 0xf8, 0xbf, 0x06, 0xb0, 0x8d, 0xf9, 0x4e, 0x8b, 0x58, 0xfc, 0xd3, 0xf3, 0xaf, - 0xf5, 0xc4, 0xc7, 0x1c, 0xa3, 0x9c, 0xc7, 0xde, 0x68, 0x6a, 0x05, 0x36, 0x35, 0xc8, 0x7f, 0x0f, - 0xc3, 0xb3, 0xf0, 0x5c, 0xa9, 0x7c, 0x1b, 0x9c, 0x2a, 0x3a, 0x0b, 0xcf, 0xff, 0x20, 0xb2, 0x0e, - 0xe2, 0xed, 0xc8, 0xa6, 0x6c, 0x6f, 0x47, 0x36, 0x25, 0xde, 0x4e, 0x59, 0x89, 0x50, 0x09, 0x38, - 0xa0, 0xca, 0xf6, 0x39, 0x8c, 0xf5, 0x0d, 0xe2, 0x0c, 0xc7, 0x5c, 0xf2, 0x48, 0x92, 0x5b, 0x60, - 0x97, 0xa2, 0x36, 0xd9, 0xaf, 0x5f, 0x1d, 0x73, 0x2e, 0x6a, 0x8a, 0x51, 0x72, 0x1f, 0xdc, 0x4a, - 0x7d, 0x68, 0xf6, 0xb7, 0xd7, 0xf1, 0xba, 0xc3, 0xa6, 0x86, 0xe3, 0x3f, 0x83, 0xdd, 0x39, 0xab, - 0xd8, 0xb2, 0x3d, 0xbc, 0x47, 0xe0, 0xe0, 0x5c, 0x58, 0xc4, 0x0e, 0x76, 0x66, 0xfb, 0xfd, 0x11, - 0xae, 0x76, 0x43, 0x35, 0xd1, 0x0f, 0x60, 0xbc, 0xce, 0x70, 0xc2, 0x99, 0x5c, 0x55, 0xea, 0xff, - 0x2e, 0xe6, 0x4c, 0xea, 0x2c, 0xbb, 0x54, 0x03, 0xff, 0x69, 0x8f, 0xf9, 0x52, 0x2c, 0x4b, 0xd6, - 0x31, 0x8f, 0xd4, 0x50, 0x86, 0x79, 0xd4, 0x7a, 0x67, 0x6a, 0x04, 0xe3, 0x9d, 0xf9, 0x4f, 0x4c, - 0xaf, 0x1f, 0x44, 0x2e, 0x50, 0xc8, 0x03, 0x70, 0xb2, 0x22, 0x16, 0x6d, 0xaf, 0x3d, 0x41, 0xcc, - 0x42, 0xa8, 0x8e, 0xbf, 0x18, 0x7f, 0xbd, 0x9c, 0x58, 0xdf, 0x2f, 0x27, 0xd6, 0x8f, 0xcb, 0x89, - 0xf5, 0xe5, 0xe7, 0xe4, 0xbf, 0xd0, 0x55, 0xd4, 0xc7, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x64, - 0xac, 0xaa, 0x80, 0xc3, 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) { @@ -857,8 +842,16 @@ i = encodeVarintSdk(dAtA, i, uint64(len(m.Data))) i += copy(dAtA[i:], m.Data) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + 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 } @@ -898,9 +891,6 @@ i++ encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Confidence)))) i += 4 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } return i, nil } @@ -944,9 +934,6 @@ dAtA[i] = 0x28 i++ i = encodeVarintSdk(dAtA, i, uint64(m.Smile)) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } return i, nil } @@ -1036,9 +1023,6 @@ i++ i = encodeVarintSdk(dAtA, i, uint64(len(m.FacialData))) i += copy(dAtA[i:], m.FacialData) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } return i, nil } @@ -1134,9 +1118,6 @@ i++ i = encodeVarintSdk(dAtA, i, uint64(m.FaceID)) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -1176,9 +1157,6 @@ encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Prob)))) i += 4 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -1217,9 +1195,6 @@ } i += n15 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -1250,9 +1225,6 @@ i += n } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -1278,9 +1250,6 @@ i = encodeVarintSdk(dAtA, i, uint64(len(b))) i += copy(dAtA[i:], b) } - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } return i, nil } @@ -1312,9 +1281,6 @@ i = encodeVarintSdk(dAtA, i, uint64(len(m.Feat2))) i += copy(dAtA[i:], m.Feat2) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -1345,9 +1311,6 @@ i += n } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } return i, nil } @@ -1376,8 +1339,12 @@ if l > 0 { n += 1 + l + sovSdk(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) + 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 } @@ -1399,9 +1366,6 @@ } if m.Confidence != 0 { n += 5 - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) } return n } @@ -1426,9 +1390,6 @@ } if m.Smile != 0 { n += 1 + sovSdk(uint64(m.Smile)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) } return n } @@ -1469,9 +1430,6 @@ l = len(m.FacialData) if l > 0 { n += 1 + l + sovSdk(uint64(l)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) } return n } @@ -1516,9 +1474,6 @@ if m.FaceID != 0 { n += 1 + sovSdk(uint64(m.FaceID)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1538,9 +1493,6 @@ if m.Prob != 0 { n += 5 } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1558,9 +1510,6 @@ l = m.Result.Size() n += 1 + l + sovSdk(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1576,9 +1525,6 @@ n += 1 + l + sovSdk(uint64(l)) } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1593,9 +1539,6 @@ l = len(b) n += 1 + l + sovSdk(uint64(l)) } - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) } return n } @@ -1614,9 +1557,6 @@ if l > 0 { n += 1 + l + sovSdk(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1631,9 +1571,6 @@ l = e.Size() n += 1 + l + sovSdk(uint64(l)) } - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) } return n } @@ -1752,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:]) @@ -1767,7 +1755,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1889,7 +1876,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2038,7 +2024,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2361,7 +2346,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2703,7 +2687,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2823,7 +2806,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2949,7 +2931,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3037,7 +3018,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3123,7 +3103,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3245,7 +3224,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3333,7 +3311,6 @@ if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } -- Gitblit v1.8.0