From a32445f65a09383aff64f43d0d52196872f0e2c6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 04 十二月 2019 16:36:53 +0800
Subject: [PATCH] add videoChannelCount,imgChannelCount,audioChannelCount
---
fileanalysis.pb.go | 144 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 108 insertions(+), 36 deletions(-)
diff --git a/fileanalysis.pb.go b/fileanalysis.pb.go
index d58f292..47dc22a 100644
--- a/fileanalysis.pb.go
+++ b/fileanalysis.pb.go
@@ -171,9 +171,11 @@
}
type FileAnalysisSetting struct {
- VideoEnable bool `protobuf:"varint,1,opt,name=videoEnable,proto3" json:"videoEnable,omitempty"`
- FileDirectory string `protobuf:"bytes,2,opt,name=fileDirectory,proto3" json:"fileDirectory,omitempty"`
- ChannelCount int32 `protobuf:"varint,3,opt,name=channelCount,proto3" json:"channelCount,omitempty"`
+ VideoEnable bool `protobuf:"varint,1,opt,name=videoEnable,proto3" json:"videoEnable,omitempty"`
+ FileDirectory string `protobuf:"bytes,2,opt,name=fileDirectory,proto3" json:"fileDirectory,omitempty"`
+ VideoChannelCount int32 `protobuf:"varint,3,opt,name=videoChannelCount,proto3" json:"videoChannelCount,omitempty"`
+ ImgChannelCount int32 `protobuf:"varint,4,opt,name=imgChannelCount,proto3" json:"imgChannelCount,omitempty"`
+ AudioChannelCount int32 `protobuf:"varint,5,opt,name=audioChannelCount,proto3" json:"audioChannelCount,omitempty"`
}
func (m *FileAnalysisSetting) Reset() { *m = FileAnalysisSetting{} }
@@ -223,9 +225,23 @@
return ""
}
-func (m *FileAnalysisSetting) GetChannelCount() int32 {
+func (m *FileAnalysisSetting) GetVideoChannelCount() int32 {
if m != nil {
- return m.ChannelCount
+ return m.VideoChannelCount
+ }
+ return 0
+}
+
+func (m *FileAnalysisSetting) GetImgChannelCount() int32 {
+ if m != nil {
+ return m.ImgChannelCount
+ }
+ return 0
+}
+
+func (m *FileAnalysisSetting) GetAudioChannelCount() int32 {
+ if m != nil {
+ return m.AudioChannelCount
}
return 0
}
@@ -238,30 +254,32 @@
func init() { proto.RegisterFile("fileanalysis.proto", fileDescriptor_4bee17140da7bca9) }
var fileDescriptor_4bee17140da7bca9 = []byte{
- // 366 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0x4f, 0x6e, 0xe2, 0x30,
- 0x14, 0xc6, 0x71, 0x86, 0x30, 0xe1, 0x11, 0x58, 0x78, 0x46, 0x23, 0x6b, 0xa4, 0x46, 0x29, 0xea,
- 0x82, 0x55, 0x37, 0x3d, 0x41, 0xff, 0x1e, 0x20, 0xa5, 0x6b, 0x64, 0xc8, 0x2b, 0x58, 0x32, 0x76,
- 0x64, 0x3b, 0x95, 0x58, 0xf6, 0x06, 0x3d, 0x56, 0x97, 0x2c, 0xbb, 0xac, 0xe0, 0x06, 0x3d, 0x41,
- 0x65, 0x07, 0x28, 0xac, 0xf2, 0xbe, 0xdf, 0x2f, 0x4f, 0x7a, 0xca, 0x17, 0xa0, 0xcf, 0x42, 0x22,
- 0x57, 0x5c, 0xae, 0xac, 0xb0, 0x97, 0x95, 0xd1, 0x4e, 0xd3, 0x24, 0x3c, 0x96, 0x76, 0x3e, 0xfc,
- 0x8a, 0x20, 0x7d, 0x10, 0x12, 0xaf, 0x77, 0x2f, 0xd0, 0x01, 0x44, 0xa2, 0x64, 0x24, 0x27, 0xa3,
- 0x6e, 0x11, 0x89, 0x92, 0x52, 0x68, 0x2b, 0xbe, 0x44, 0x16, 0x05, 0x12, 0x66, 0xcf, 0x2a, 0xee,
- 0x16, 0xec, 0x57, 0xc3, 0xfc, 0xec, 0x99, 0x5b, 0x55, 0xc8, 0xda, 0x39, 0x19, 0xc5, 0x45, 0x98,
- 0x3d, 0xb3, 0xda, 0x38, 0x16, 0x37, 0xcc, 0xcf, 0xf4, 0x2f, 0xc4, 0x5c, 0x0a, 0x6e, 0x59, 0x27,
- 0x2c, 0x37, 0x81, 0x9e, 0x43, 0x6a, 0x15, 0xaf, 0xec, 0x42, 0xbb, 0x49, 0x6d, 0x24, 0xfb, 0x1d,
- 0x64, 0x6f, 0xcf, 0x9e, 0x8c, 0xa4, 0xff, 0x21, 0x29, 0x6b, 0xc3, 0x9d, 0xd0, 0x8a, 0x25, 0x41,
- 0x1f, 0x32, 0x3d, 0x03, 0x10, 0x76, 0x62, 0x6a, 0xa5, 0x84, 0x9a, 0xb3, 0x6e, 0x4e, 0x46, 0x49,
- 0xd1, 0x15, 0xb6, 0x68, 0x80, 0x5f, 0xad, 0x8c, 0x9e, 0x1b, 0xb4, 0x96, 0x41, 0xb8, 0xe5, 0x90,
- 0xbd, 0x33, 0xb5, 0xc4, 0xb1, 0xbf, 0xbd, 0xd7, 0xb8, 0x7d, 0xa6, 0xff, 0xa0, 0x63, 0x1d, 0x77,
- 0xb5, 0x65, 0x69, 0x30, 0xbb, 0x44, 0x33, 0x80, 0x99, 0x41, 0xee, 0x70, 0x2c, 0x96, 0xc8, 0xfa,
- 0xe1, 0x98, 0x23, 0xe2, 0x7d, 0x5d, 0x95, 0x7b, 0x3f, 0x68, 0xfc, 0x0f, 0x19, 0xbe, 0x12, 0xf8,
- 0x73, 0xfc, 0xd1, 0x1f, 0xd1, 0x39, 0x7f, 0x67, 0x0e, 0xbd, 0x17, 0x51, 0xa2, 0xbe, 0x57, 0x7c,
- 0x2a, 0x31, 0x94, 0x90, 0x14, 0xc7, 0x88, 0x5e, 0x40, 0xdf, 0xd7, 0x79, 0x27, 0x0c, 0xce, 0x9c,
- 0x36, 0xab, 0x5d, 0x2d, 0xa7, 0x90, 0x0e, 0x21, 0x9d, 0x2d, 0xb8, 0x52, 0x28, 0x6f, 0x75, 0xad,
- 0x5c, 0xe8, 0x29, 0x2e, 0x4e, 0xd8, 0x0d, 0x7b, 0xdf, 0x64, 0x64, 0xbd, 0xc9, 0xc8, 0xe7, 0x26,
- 0x23, 0x6f, 0xdb, 0xac, 0xb5, 0xde, 0x66, 0xad, 0x8f, 0x6d, 0xd6, 0x9a, 0x76, 0xc2, 0xcf, 0x71,
- 0xf5, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xab, 0xd3, 0x66, 0x3e, 0x39, 0x02, 0x00, 0x00,
+ // 390 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0x4b, 0xee, 0xd3, 0x30,
+ 0x10, 0x87, 0xeb, 0xd0, 0x94, 0x74, 0xfa, 0x40, 0x18, 0x84, 0x2c, 0x24, 0xa2, 0x50, 0xb1, 0xc8,
+ 0x02, 0xb1, 0xe1, 0x04, 0x50, 0xe0, 0x00, 0xa1, 0xac, 0x2b, 0xb7, 0x31, 0xa9, 0x25, 0xc7, 0x8e,
+ 0xfc, 0x40, 0xea, 0x2d, 0x38, 0x16, 0xcb, 0x2e, 0x59, 0xa2, 0xe6, 0x06, 0x9c, 0x00, 0xd9, 0x6e,
+ 0x4b, 0xfb, 0xef, 0x2a, 0x33, 0xdf, 0xe7, 0xb1, 0x46, 0xf9, 0x19, 0xf0, 0x77, 0x2e, 0x18, 0x95,
+ 0x54, 0xec, 0x0d, 0x37, 0xef, 0x3a, 0xad, 0xac, 0xc2, 0x59, 0xf8, 0xb4, 0xa6, 0x59, 0xfc, 0x4d,
+ 0x60, 0xfa, 0x85, 0x0b, 0xf6, 0xe1, 0x74, 0x00, 0xcf, 0x21, 0xe1, 0x35, 0x41, 0x05, 0x2a, 0xc7,
+ 0x55, 0xc2, 0x6b, 0x8c, 0x61, 0x28, 0x69, 0xcb, 0x48, 0x12, 0x48, 0xa8, 0x3d, 0xeb, 0xa8, 0xdd,
+ 0x91, 0x47, 0x91, 0xf9, 0xda, 0x33, 0xbb, 0xef, 0x18, 0x19, 0x16, 0xa8, 0x4c, 0xab, 0x50, 0x7b,
+ 0x66, 0x94, 0xb6, 0x24, 0x8d, 0xcc, 0xd7, 0xf8, 0x39, 0xa4, 0x54, 0x70, 0x6a, 0xc8, 0x28, 0x0c,
+ 0xc7, 0x06, 0xbf, 0x86, 0xa9, 0x91, 0xb4, 0x33, 0x3b, 0x65, 0xd7, 0x4e, 0x0b, 0xf2, 0x38, 0xc8,
+ 0xc9, 0x99, 0x7d, 0xd3, 0x02, 0xbf, 0x84, 0xac, 0x76, 0x9a, 0x5a, 0xae, 0x24, 0xc9, 0x82, 0xbe,
+ 0xf4, 0xf8, 0x15, 0x00, 0x37, 0x6b, 0xed, 0xa4, 0xe4, 0xb2, 0x21, 0xe3, 0x02, 0x95, 0x59, 0x35,
+ 0xe6, 0xa6, 0x8a, 0xc0, 0x8f, 0x76, 0x5a, 0x35, 0x9a, 0x19, 0x43, 0x20, 0xec, 0x72, 0xe9, 0xbd,
+ 0xd3, 0x4e, 0xb0, 0x95, 0xdf, 0x7d, 0x12, 0xdd, 0xb9, 0xc7, 0x2f, 0x60, 0x64, 0x2c, 0xb5, 0xce,
+ 0x90, 0x69, 0x30, 0xa7, 0x0e, 0xe7, 0x00, 0x5b, 0xcd, 0xa8, 0x65, 0x2b, 0xde, 0x32, 0x32, 0x0b,
+ 0xcb, 0x5c, 0x11, 0xef, 0x5d, 0x57, 0x9f, 0xfd, 0x3c, 0xfa, 0xff, 0x64, 0xd1, 0x23, 0x78, 0x76,
+ 0xfd, 0xd3, 0xbf, 0x32, 0x6b, 0xfd, 0x9e, 0x05, 0x4c, 0x7e, 0xf0, 0x9a, 0xa9, 0xcf, 0x92, 0x6e,
+ 0x04, 0x0b, 0x21, 0x64, 0xd5, 0x35, 0xc2, 0x6f, 0x60, 0xe6, 0xe3, 0xfc, 0xc4, 0x35, 0xdb, 0x5a,
+ 0xa5, 0xf7, 0xa7, 0x58, 0x6e, 0x21, 0x7e, 0x0b, 0x4f, 0xc3, 0xd0, 0x72, 0x47, 0xa5, 0x64, 0x62,
+ 0xa9, 0x9c, 0xb4, 0x21, 0xac, 0xb4, 0xba, 0x17, 0xb8, 0x84, 0x27, 0xbc, 0x6d, 0x6e, 0xce, 0xc6,
+ 0x10, 0x1f, 0x62, 0x7f, 0x2f, 0x75, 0x35, 0xbf, 0xbd, 0x37, 0x86, 0x7b, 0x2f, 0x3e, 0x92, 0x5f,
+ 0xc7, 0x1c, 0x1d, 0x8e, 0x39, 0xfa, 0x73, 0xcc, 0xd1, 0xcf, 0x3e, 0x1f, 0x1c, 0xfa, 0x7c, 0xf0,
+ 0xbb, 0xcf, 0x07, 0x9b, 0x51, 0x78, 0x7e, 0xef, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x5e,
+ 0x93, 0x7d, 0x9b, 0x02, 0x00, 0x00,
}
func (m *FileAnalysis) Marshal() (dAtA []byte, err error) {
@@ -396,10 +414,20 @@
i = encodeVarintFileanalysis(dAtA, i, uint64(len(m.FileDirectory)))
i += copy(dAtA[i:], m.FileDirectory)
}
- if m.ChannelCount != 0 {
+ if m.VideoChannelCount != 0 {
dAtA[i] = 0x18
i++
- i = encodeVarintFileanalysis(dAtA, i, uint64(m.ChannelCount))
+ i = encodeVarintFileanalysis(dAtA, i, uint64(m.VideoChannelCount))
+ }
+ if m.ImgChannelCount != 0 {
+ dAtA[i] = 0x20
+ i++
+ i = encodeVarintFileanalysis(dAtA, i, uint64(m.ImgChannelCount))
+ }
+ if m.AudioChannelCount != 0 {
+ dAtA[i] = 0x28
+ i++
+ i = encodeVarintFileanalysis(dAtA, i, uint64(m.AudioChannelCount))
}
return i, nil
}
@@ -485,8 +513,14 @@
if l > 0 {
n += 1 + l + sovFileanalysis(uint64(l))
}
- if m.ChannelCount != 0 {
- n += 1 + sovFileanalysis(uint64(m.ChannelCount))
+ if m.VideoChannelCount != 0 {
+ n += 1 + sovFileanalysis(uint64(m.VideoChannelCount))
+ }
+ if m.ImgChannelCount != 0 {
+ n += 1 + sovFileanalysis(uint64(m.ImgChannelCount))
+ }
+ if m.AudioChannelCount != 0 {
+ n += 1 + sovFileanalysis(uint64(m.AudioChannelCount))
}
return n
}
@@ -1004,9 +1038,9 @@
iNdEx = postIndex
case 3:
if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field ChannelCount", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field VideoChannelCount", wireType)
}
- m.ChannelCount = 0
+ m.VideoChannelCount = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowFileanalysis
@@ -1016,7 +1050,45 @@
}
b := dAtA[iNdEx]
iNdEx++
- m.ChannelCount |= int32(b&0x7F) << shift
+ m.VideoChannelCount |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ case 4:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field ImgChannelCount", wireType)
+ }
+ m.ImgChannelCount = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowFileanalysis
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.ImgChannelCount |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ case 5:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field AudioChannelCount", wireType)
+ }
+ m.AudioChannelCount = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowFileanalysis
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.AudioChannelCount |= int32(b&0x7F) << shift
if b < 0x80 {
break
}
--
Gitblit v1.8.0