From abd6d2381b39009f8bd9faf47ddf4535a1596fdc Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 04 十二月 2019 13:24:47 +0800
Subject: [PATCH] add pollChannelCount to PollConfig
---
fileanalysis.pb.go | 168 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 109 insertions(+), 59 deletions(-)
diff --git a/fileanalysis.pb.go b/fileanalysis.pb.go
index 67e81cb..d58f292 100644
--- a/fileanalysis.pb.go
+++ b/fileanalysis.pb.go
@@ -30,12 +30,13 @@
Sort int32 `protobuf:"varint,5,opt,name=sort,proto3" json:"sort,omitempty"`
Alias string `protobuf:"bytes,6,opt,name=alias,proto3" json:"alias,omitempty"`
SnapshotUrl string `protobuf:"bytes,7,opt,name=snapshot_url,json=snapshotUrl,proto3" json:"snapshot_url,omitempty"`
- IsRunning bool `protobuf:"varint,8,opt,name=is_running,json=isRunning,proto3" json:"is_running,omitempty"`
- Progress int32 `protobuf:"varint,9,opt,name=progress,proto3" json:"progress,omitempty"`
- RuleType int32 `protobuf:"varint,10,opt,name=ruleType,proto3" json:"ruleType,omitempty"`
- Status int32 `protobuf:"varint,11,opt,name=status,proto3" json:"status,omitempty"`
- CreateTime string `protobuf:"bytes,12,opt,name=createTime,proto3" json:"createTime,omitempty"`
- UpdateTime string `protobuf:"bytes,13,opt,name=updateTime,proto3" json:"updateTime,omitempty"`
+ Duration string `protobuf:"bytes,8,opt,name=duration,proto3" json:"duration,omitempty"`
+ IsRunning bool `protobuf:"varint,9,opt,name=is_running,json=isRunning,proto3" json:"is_running,omitempty"`
+ Progress int32 `protobuf:"varint,10,opt,name=progress,proto3" json:"progress,omitempty"`
+ RuleType int32 `protobuf:"varint,11,opt,name=ruleType,proto3" json:"ruleType,omitempty"`
+ Status int32 `protobuf:"varint,12,opt,name=status,proto3" json:"status,omitempty"`
+ CreateTime string `protobuf:"bytes,13,opt,name=createTime,proto3" json:"createTime,omitempty"`
+ UpdateTime string `protobuf:"bytes,14,opt,name=updateTime,proto3" json:"updateTime,omitempty"`
}
func (m *FileAnalysis) Reset() { *m = FileAnalysis{} }
@@ -120,6 +121,13 @@
return ""
}
+func (m *FileAnalysis) GetDuration() string {
+ if m != nil {
+ return m.Duration
+ }
+ return ""
+}
+
func (m *FileAnalysis) GetIsRunning() bool {
if m != nil {
return m.IsRunning
@@ -163,9 +171,9 @@
}
type FileAnalysisSetting struct {
- VideoFileEnable bool `protobuf:"varint,1,opt,name=videoFileEnable,proto3" json:"videoFileEnable,omitempty"`
- VideoDirectory string `protobuf:"bytes,2,opt,name=videoDirectory,proto3" json:"videoDirectory,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"`
+ ChannelCount int32 `protobuf:"varint,3,opt,name=channelCount,proto3" json:"channelCount,omitempty"`
}
func (m *FileAnalysisSetting) Reset() { *m = FileAnalysisSetting{} }
@@ -201,16 +209,16 @@
var xxx_messageInfo_FileAnalysisSetting proto.InternalMessageInfo
-func (m *FileAnalysisSetting) GetVideoFileEnable() bool {
+func (m *FileAnalysisSetting) GetVideoEnable() bool {
if m != nil {
- return m.VideoFileEnable
+ return m.VideoEnable
}
return false
}
-func (m *FileAnalysisSetting) GetVideoDirectory() string {
+func (m *FileAnalysisSetting) GetFileDirectory() string {
if m != nil {
- return m.VideoDirectory
+ return m.FileDirectory
}
return ""
}
@@ -230,30 +238,30 @@
func init() { proto.RegisterFile("fileanalysis.proto", fileDescriptor_4bee17140da7bca9) }
var fileDescriptor_4bee17140da7bca9 = []byte{
- // 356 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0x4f, 0x6e, 0xe2, 0x30,
- 0x14, 0xc6, 0x71, 0x86, 0x30, 0xe1, 0x91, 0x61, 0x24, 0xcf, 0xa8, 0xb2, 0x2a, 0x35, 0xa2, 0x2c,
- 0xaa, 0xac, 0xba, 0xe9, 0x09, 0xfa, 0xf7, 0x00, 0x29, 0x5d, 0x23, 0x43, 0x5e, 0xc1, 0x92, 0xb1,
- 0x23, 0xdb, 0xa9, 0xc4, 0x19, 0xba, 0xe9, 0xb1, 0xba, 0x64, 0x55, 0x75, 0x59, 0xc1, 0x45, 0x2a,
- 0x3b, 0xd0, 0x52, 0x56, 0xf9, 0xbe, 0xdf, 0x2f, 0x51, 0x5e, 0xfc, 0x02, 0xf4, 0x51, 0x48, 0xe4,
- 0x8a, 0xcb, 0xa5, 0x15, 0xf6, 0xbc, 0x32, 0xda, 0x69, 0x9a, 0x84, 0xcb, 0xc2, 0xce, 0x86, 0x6f,
- 0x11, 0xa4, 0x77, 0x42, 0xe2, 0xe5, 0xf6, 0x06, 0xda, 0x87, 0x48, 0x94, 0x8c, 0x0c, 0x48, 0xde,
- 0x2d, 0x22, 0x51, 0x52, 0x0a, 0x6d, 0xc5, 0x17, 0xc8, 0xa2, 0x40, 0x42, 0xf6, 0xac, 0xe2, 0x6e,
- 0xce, 0x7e, 0x35, 0xcc, 0x67, 0xcf, 0xdc, 0xb2, 0x42, 0xd6, 0x1e, 0x90, 0x3c, 0x2e, 0x42, 0xf6,
- 0xcc, 0x6a, 0xe3, 0x58, 0xdc, 0x30, 0x9f, 0xe9, 0x7f, 0x88, 0xb9, 0x14, 0xdc, 0xb2, 0x4e, 0x78,
- 0xb8, 0x29, 0xf4, 0x14, 0x52, 0xab, 0x78, 0x65, 0xe7, 0xda, 0x8d, 0x6b, 0x23, 0xd9, 0xef, 0x20,
- 0x7b, 0x3b, 0xf6, 0x60, 0x24, 0x3d, 0x01, 0x10, 0x76, 0x6c, 0x6a, 0xa5, 0x84, 0x9a, 0xb1, 0x64,
- 0x40, 0xf2, 0xa4, 0xe8, 0x0a, 0x5b, 0x34, 0x80, 0x1e, 0x83, 0xff, 0xa8, 0x99, 0x41, 0x6b, 0x59,
- 0x37, 0xbc, 0xef, 0xab, 0x7b, 0x67, 0x6a, 0x89, 0x23, 0x3f, 0x1f, 0x34, 0x6e, 0xd7, 0xe9, 0x11,
- 0x74, 0xac, 0xe3, 0xae, 0xb6, 0xac, 0x17, 0xcc, 0xb6, 0xd1, 0x0c, 0x60, 0x6a, 0x90, 0x3b, 0x1c,
- 0x89, 0x05, 0xb2, 0x34, 0xcc, 0xb3, 0x47, 0xbc, 0xaf, 0xab, 0x72, 0xe7, 0xff, 0x34, 0xfe, 0x9b,
- 0x0c, 0x9f, 0x09, 0xfc, 0xdb, 0x3f, 0xd8, 0x7b, 0x74, 0xce, 0xcf, 0x99, 0xc3, 0xdf, 0x27, 0x51,
- 0xa2, 0xf6, 0xee, 0x56, 0xf1, 0x89, 0xc4, 0x70, 0xd8, 0x49, 0x71, 0x88, 0xe9, 0x19, 0xf4, 0x03,
- 0xba, 0x11, 0x06, 0xa7, 0x4e, 0x9b, 0xe5, 0x76, 0x07, 0x07, 0x94, 0x0e, 0x21, 0x9d, 0xce, 0xb9,
- 0x52, 0x28, 0xaf, 0x75, 0xad, 0x5c, 0xd8, 0x4a, 0x5c, 0xfc, 0x60, 0x57, 0xec, 0x75, 0x9d, 0x91,
- 0xd5, 0x3a, 0x23, 0x1f, 0xeb, 0x8c, 0xbc, 0x6c, 0xb2, 0xd6, 0x6a, 0x93, 0xb5, 0xde, 0x37, 0x59,
- 0x6b, 0xd2, 0x09, 0xbf, 0xc2, 0xc5, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x8d, 0x74, 0x6a,
- 0x27, 0x02, 0x00, 0x00,
+ // 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,
}
func (m *FileAnalysis) Marshal() (dAtA []byte, err error) {
@@ -311,8 +319,14 @@
i = encodeVarintFileanalysis(dAtA, i, uint64(len(m.SnapshotUrl)))
i += copy(dAtA[i:], m.SnapshotUrl)
}
+ if len(m.Duration) > 0 {
+ dAtA[i] = 0x42
+ i++
+ i = encodeVarintFileanalysis(dAtA, i, uint64(len(m.Duration)))
+ i += copy(dAtA[i:], m.Duration)
+ }
if m.IsRunning {
- dAtA[i] = 0x40
+ dAtA[i] = 0x48
i++
if m.IsRunning {
dAtA[i] = 1
@@ -322,28 +336,28 @@
i++
}
if m.Progress != 0 {
- dAtA[i] = 0x48
+ dAtA[i] = 0x50
i++
i = encodeVarintFileanalysis(dAtA, i, uint64(m.Progress))
}
if m.RuleType != 0 {
- dAtA[i] = 0x50
+ dAtA[i] = 0x58
i++
i = encodeVarintFileanalysis(dAtA, i, uint64(m.RuleType))
}
if m.Status != 0 {
- dAtA[i] = 0x58
+ dAtA[i] = 0x60
i++
i = encodeVarintFileanalysis(dAtA, i, uint64(m.Status))
}
if len(m.CreateTime) > 0 {
- dAtA[i] = 0x62
+ dAtA[i] = 0x6a
i++
i = encodeVarintFileanalysis(dAtA, i, uint64(len(m.CreateTime)))
i += copy(dAtA[i:], m.CreateTime)
}
if len(m.UpdateTime) > 0 {
- dAtA[i] = 0x6a
+ dAtA[i] = 0x72
i++
i = encodeVarintFileanalysis(dAtA, i, uint64(len(m.UpdateTime)))
i += copy(dAtA[i:], m.UpdateTime)
@@ -366,21 +380,21 @@
_ = i
var l int
_ = l
- if m.VideoFileEnable {
+ if m.VideoEnable {
dAtA[i] = 0x8
i++
- if m.VideoFileEnable {
+ if m.VideoEnable {
dAtA[i] = 1
} else {
dAtA[i] = 0
}
i++
}
- if len(m.VideoDirectory) > 0 {
+ if len(m.FileDirectory) > 0 {
dAtA[i] = 0x12
i++
- i = encodeVarintFileanalysis(dAtA, i, uint64(len(m.VideoDirectory)))
- i += copy(dAtA[i:], m.VideoDirectory)
+ i = encodeVarintFileanalysis(dAtA, i, uint64(len(m.FileDirectory)))
+ i += copy(dAtA[i:], m.FileDirectory)
}
if m.ChannelCount != 0 {
dAtA[i] = 0x18
@@ -431,6 +445,10 @@
if l > 0 {
n += 1 + l + sovFileanalysis(uint64(l))
}
+ l = len(m.Duration)
+ if l > 0 {
+ n += 1 + l + sovFileanalysis(uint64(l))
+ }
if m.IsRunning {
n += 2
}
@@ -460,10 +478,10 @@
}
var l int
_ = l
- if m.VideoFileEnable {
+ if m.VideoEnable {
n += 2
}
- l = len(m.VideoDirectory)
+ l = len(m.FileDirectory)
if l > 0 {
n += 1 + l + sovFileanalysis(uint64(l))
}
@@ -707,6 +725,38 @@
m.SnapshotUrl = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 8:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Duration", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowFileanalysis
+ }
+ 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 ErrInvalidLengthFileanalysis
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthFileanalysis
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Duration = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 9:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field IsRunning", wireType)
}
@@ -726,7 +776,7 @@
}
}
m.IsRunning = bool(v != 0)
- case 9:
+ case 10:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Progress", wireType)
}
@@ -745,7 +795,7 @@
break
}
}
- case 10:
+ case 11:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field RuleType", wireType)
}
@@ -764,7 +814,7 @@
break
}
}
- case 11:
+ case 12:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType)
}
@@ -783,7 +833,7 @@
break
}
}
- case 12:
+ case 13:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field CreateTime", wireType)
}
@@ -815,7 +865,7 @@
}
m.CreateTime = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 13:
+ case 14:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field UpdateTime", wireType)
}
@@ -902,7 +952,7 @@
switch fieldNum {
case 1:
if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field VideoFileEnable", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field VideoEnable", wireType)
}
var v int
for shift := uint(0); ; shift += 7 {
@@ -919,10 +969,10 @@
break
}
}
- m.VideoFileEnable = bool(v != 0)
+ m.VideoEnable = bool(v != 0)
case 2:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field VideoDirectory", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field FileDirectory", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@@ -950,7 +1000,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.VideoDirectory = string(dAtA[iNdEx:postIndex])
+ m.FileDirectory = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 0 {
--
Gitblit v1.8.0