mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revid/config/config.go: checking WriteRate as we need that for encoders

This commit is contained in:
Saxon 2019-11-13 13:58:53 +10:30
parent cf130de752
commit 527472e934
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
revid/config/config.go
View File

@ -71,7 +71,6 @@ const (
// General revid defaults. // General revid defaults.
defaultInput = InputRaspivid defaultInput = InputRaspivid
defaultOutput = OutputHTTP defaultOutput = OutputHTTP
defaultWriteRate = 25
defaultTimeout = 0 defaultTimeout = 0
defaultInputCodec = codecutil.H264 defaultInputCodec = codecutil.H264
defaultVerbosity = logger.Error defaultVerbosity = logger.Error
@ -80,6 +79,7 @@ const (
defaultBurstPeriod = 10 // Seconds defaultBurstPeriod = 10 // Seconds
defaultMinFrames = 100 defaultMinFrames = 100
defaultFrameRate = 25 defaultFrameRate = 25
defaultWriteRate = 25
defaultClipDuration = 0 defaultClipDuration = 0
defaultAudioInputCodec = codecutil.ADPCM defaultAudioInputCodec = codecutil.ADPCM
@ -335,11 +335,14 @@ func (c *Config) Validate() error {
return errors.New("refresh period is less than 0") return errors.New("refresh period is less than 0")
} }
if c.FrameRate == 0 { if c.FrameRate <= 0 {
c.Logger.Log(logger.Info, pkg+"no frame rate defined, defaulting", "FrameRate", defaultFrameRate) c.Logger.Log(logger.Info, pkg+"frame rate bad or unset, defaulting", "FrameRate", defaultFrameRate)
c.FrameRate = defaultFrameRate c.FrameRate = defaultFrameRate
} else if c.FrameRate < 0 { }
return errors.New("frame rate less than 0")
if c.WriteRate <= 0 {
c.Logger.Log(logger.Info, pkg+"write rate bad or unset, defaulting", "writeRate", defaultWriteRate)
c.WriteRate = defaultWriteRate
} }
if c.ClipDuration == 0 { if c.ClipDuration == 0 {