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

Made variable for showing windows

This commit is contained in:
Scott 2020-01-02 11:45:36 +10:30
parent d7fa1569a4
commit 55981f8ae9
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
revid/config/config.go
View File

@ -236,6 +236,10 @@ type Config struct {
// of the file. // of the file.
Exposure string Exposure string
// ShowWindows enables or disables the display of windows used for debugging
// motion filters.
ShowWindows bool
// AutoWhiteBalance defines the auto white balance mode used by Raspivid input. // AutoWhiteBalance defines the auto white balance mode used by Raspivid input.
// Valid modes are defined in the exported []string AutoWhiteBalanceModes // Valid modes are defined in the exported []string AutoWhiteBalanceModes
// defined at the start of the file. // defined at the start of the file.
@ -304,6 +308,7 @@ var TypeData = map[string]string{
"RTMPURL": "string", "RTMPURL": "string",
"RTPAddress": "string", "RTPAddress": "string",
"Saturation": "int", "Saturation": "int",
"ShowWindows": "bool",
"VBRBitrate": "int", "VBRBitrate": "int",
"VBRQuality": "enum:standard,fair,good,great,excellent", "VBRQuality": "enum:standard,fair,good,great,excellent",
"VerticalFlip": "bool", "VerticalFlip": "bool",

16
revid/revid.go
View File

@ -350,11 +350,11 @@ func (r *Revid) setupPipeline(mtsEnc func(dst io.WriteCloser, rate float64) (io.
case config.FilterNoOp: case config.FilterNoOp:
r.filter = filter.NewNoOp(r.encoders) r.filter = filter.NewNoOp(r.encoders)
case config.FilterMOG: case config.FilterMOG:
r.filter = filter.NewMOGFilter(r.encoders, mogMinArea, mogThreshold, mogHistory, showWindows) r.filter = filter.NewMOGFilter(r.encoders, mogMinArea, mogThreshold, mogHistory, r.cfg.ShowWindows)
case config.FilterVariableFPS: case config.FilterVariableFPS:
r.filter = filter.NewVariableFPSFilter(r.encoders, minFPS, filter.NewMOGFilter(r.encoders, mogMinArea, mogThreshold, mogHistory, showWindows)) r.filter = filter.NewVariableFPSFilter(r.encoders, minFPS, filter.NewMOGFilter(r.encoders, mogMinArea, mogThreshold, mogHistory, r.cfg.ShowWindows))
case config.FilterKNN: case config.FilterKNN:
r.filter = filter.NewKNNFilter(r.encoders, knnMinArea, knnThreshold, knnHistory, knnKernel, showWindows) r.filter = filter.NewKNNFilter(r.encoders, knnMinArea, knnThreshold, knnHistory, knnKernel, r.cfg.ShowWindows)
default: default:
panic("Undefined Filter") panic("Undefined Filter")
@ -773,6 +773,16 @@ func (r *Revid) Update(vars map[string]string) error {
break break
} }
r.cfg.CameraChan = v r.cfg.CameraChan = v
case "ShowWindows":
switch strings.ToLower(value) {
case "true":
r.cfg.ShowWindows = true
case "false":
r.cfg.ShowWindows = false
default:
r.cfg.Logger.Log(logger.Warning, pkg+"invalid ShowWindows var", "value", value)
break
}
} }
} }
r.cfg.Logger.Log(logger.Info, pkg+"revid config changed", "config", fmt.Sprintf("%+v", r.cfg)) r.cfg.Logger.Log(logger.Info, pkg+"revid config changed", "config", fmt.Sprintf("%+v", r.cfg))