Merged in motion-pixel-interval (pull request #367)

filter: Motion detection filter pixel interval

Approved-by: Saxon Milton <saxon.milton@gmail.com>
This commit is contained in:
Scott Barnard 2020-02-04 02:34:09 +00:00 committed by Saxon Milton
commit a7346fe68f
5 changed files with 91 additions and 66 deletions

View File

@ -32,12 +32,12 @@ import (
) )
// NewMOG returns a pointer to a new NoOp struct for testing purposes only. // NewMOG returns a pointer to a new NoOp struct for testing purposes only.
func NewMOG(dst io.WriteCloser, area, threshold float64, history int, debug bool, hf int) *NoOp { func NewMOG(dst io.WriteCloser, area, threshold float64, history int, debug bool, hf int, scaleFactor int) *NoOp {
return &NoOp{dst: dst} return &NoOp{dst: dst}
} }
// NewKNN returns a pointer to a new NoOp struct for testing purposes only. // NewKNN returns a pointer to a new NoOp struct for testing purposes only.
func NewKNN(dst io.WriteCloser, area, threshold float64, history, kernelSize int, debug bool, hf int) *NoOp { func NewKNN(dst io.WriteCloser, area, threshold float64, history, kernelSize int, debug bool, hf int, scaleFactor int) *NoOp {
return &NoOp{dst: dst} return &NoOp{dst: dst}
} }

View File

@ -49,17 +49,18 @@ type KNN struct {
hold [][]byte // Will hold all frames up to hf (so only every hf frame is motion detected). hold [][]byte // Will hold all frames up to hf (so only every hf frame is motion detected).
hf int // The number of frames to be held. hf int // The number of frames to be held.
hfCount int // Counter for the hold array. hfCount int // Counter for the hold array.
scale float64 // The factor that frames will be downscaled by for motion detection.
} }
// NewKNN returns a pointer to a new KNN filter struct. // NewKNN returns a pointer to a new KNN filter struct.
func NewKNN(dst io.WriteCloser, area, threshold float64, history, kernelSize int, debug bool, hf int) *KNN { func NewKNN(dst io.WriteCloser, area, threshold float64, history, kernelSize int, debug bool, hf int, scaleFactor int) *KNN {
bs := gocv.NewBackgroundSubtractorKNNWithParams(history, threshold, false) bs := gocv.NewBackgroundSubtractorKNNWithParams(history, threshold, false)
k := gocv.GetStructuringElement(gocv.MorphRect, image.Pt(kernelSize, kernelSize)) k := gocv.GetStructuringElement(gocv.MorphRect, image.Pt(kernelSize, kernelSize))
var windows []*gocv.Window var windows []*gocv.Window
if debug { if debug {
windows = []*gocv.Window{gocv.NewWindow("KNN: Bounding boxes"), gocv.NewWindow("KNN: Motion")} windows = []*gocv.Window{gocv.NewWindow("KNN: Bounding boxes"), gocv.NewWindow("KNN: Motion")}
} }
return &KNN{dst, area, &bs, k, debug, windows, make([][]byte, hf-1), hf, 0} return &KNN{dst, area, &bs, k, debug, windows, make([][]byte, hf-1), hf, 0, 1 / float64(scaleFactor)}
} }
// Implements io.Closer. // Implements io.Closer.
@ -94,6 +95,9 @@ func (m *KNN) Write(f []byte) (int, error) {
imgDelta := gocv.NewMat() imgDelta := gocv.NewMat()
defer imgDelta.Close() defer imgDelta.Close()
// Downsize image to speed up calculations.
gocv.Resize(img, &img, image.Point{}, m.scale, m.scale, gocv.InterpolationNearestNeighbor)
// Seperate foreground and background. // Seperate foreground and background.
m.bs.Apply(img, &imgDelta) m.bs.Apply(img, &imgDelta)

View File

@ -49,17 +49,18 @@ type MOG struct {
hold [][]byte // Will hold all frames up to hf (so only every hf frame is motion detected). hold [][]byte // Will hold all frames up to hf (so only every hf frame is motion detected).
hf int // The number of frames to be held. hf int // The number of frames to be held.
hfCount int // Counter for the hold array. hfCount int // Counter for the hold array.
scale float64 // The factor that frames will be downscaled by for motion detection.
} }
// NewMOG returns a pointer to a new MOG filter struct. // NewMOG returns a pointer to a new MOG filter struct.
func NewMOG(dst io.WriteCloser, area, threshold float64, history int, debug bool, hf int) *MOG { func NewMOG(dst io.WriteCloser, area, threshold float64, history int, debug bool, hf int, scaleFactor int) *MOG {
bs := gocv.NewBackgroundSubtractorMOG2WithParams(history, threshold, false) bs := gocv.NewBackgroundSubtractorMOG2WithParams(history, threshold, false)
k := gocv.GetStructuringElement(gocv.MorphRect, image.Pt(3, 3)) k := gocv.GetStructuringElement(gocv.MorphRect, image.Pt(3, 3))
var windows []*gocv.Window var windows []*gocv.Window
if debug { if debug {
windows = []*gocv.Window{gocv.NewWindow("MOG: Bounding boxes"), gocv.NewWindow("MOG: Motion")} windows = []*gocv.Window{gocv.NewWindow("MOG: Bounding boxes"), gocv.NewWindow("MOG: Motion")}
} }
return &MOG{dst, area, &bs, k, debug, windows, make([][]byte, hf-1), hf, 0} return &MOG{dst, area, &bs, k, debug, windows, make([][]byte, hf-1), hf, 0, 1 / float64(scaleFactor)}
} }
// Implements io.Closer. // Implements io.Closer.
@ -94,6 +95,9 @@ func (m *MOG) Write(f []byte) (int, error) {
imgDelta := gocv.NewMat() imgDelta := gocv.NewMat()
defer imgDelta.Close() defer imgDelta.Close()
// Downsize image to speed up calculations.
gocv.Resize(img, &img, image.Point{}, m.scale, m.scale, gocv.InterpolationNearestNeighbor)
// Seperate foreground and background. // Seperate foreground and background.
m.bs.Apply(img, &imgDelta) m.bs.Apply(img, &imgDelta)

View File

@ -85,7 +85,6 @@ const (
defaultClipDuration = 0 defaultClipDuration = 0
defaultAudioInputCodec = codecutil.ADPCM defaultAudioInputCodec = codecutil.ADPCM
defaultPSITime = 2 defaultPSITime = 2
defaultMotionInterval = 5
defaultFileFPS = 0 defaultFileFPS = 0
// Ring buffer defaults. // Ring buffer defaults.
@ -94,7 +93,9 @@ const (
defaultRBWriteTimeout = 5 defaultRBWriteTimeout = 5
// Motion filter parameter defaults. // Motion filter parameter defaults.
defaultMinFPS = 1.0 defaultMinFPS = 1.0
defaultMotionDownscaling = 1
defaultMotionInterval = 1
// KNN filter parameter defaults. // KNN filter parameter defaults.
defaultKNNMinArea = 25.0 defaultKNNMinArea = 25.0
@ -283,7 +284,6 @@ type Config struct {
HorizontalFlip bool // HorizontalFlip flips video horizontally for Raspivid input. HorizontalFlip bool // HorizontalFlip flips video horizontally for Raspivid input.
VerticalFlip bool // VerticalFlip flips video vertically for Raspivid input. VerticalFlip bool // VerticalFlip flips video vertically for Raspivid input.
Filters []int // Defines the methods of filtering to be used in between lexing and encoding. Filters []int // Defines the methods of filtering to be used in between lexing and encoding.
MotionInterval int // Sets the number of frames that are held before the filter is used (on the nth frame)
PSITime int // Sets the time between a packet being sent. PSITime int // Sets the time between a packet being sent.
// Ring buffer parameters. // Ring buffer parameters.
@ -292,7 +292,9 @@ type Config struct {
RBWriteTimeout int // The ringbuffer write timeout in seconds. RBWriteTimeout int // The ringbuffer write timeout in seconds.
// Motion filter parameters. // Motion filter parameters.
MinFPS float64 // The reduced framerate of the video when there is no motion. MinFPS float64 // The reduced framerate of the video when there is no motion.
MotionInterval int // Sets the number of frames that are held before the filter is used (on the nth frame)
MotionDownscaling int // Downscaling factor of frames used for motion detection.
// KNN filter parameters. // KNN filter parameters.
KNNMinArea float64 // Used to ignore small areas of motion detection. KNNMinArea float64 // Used to ignore small areas of motion detection.
@ -303,8 +305,12 @@ type Config struct {
// MOG filter parameters. // MOG filter parameters.
MOGMinArea float64 // Used to ignore small areas of motion detection. MOGMinArea float64 // Used to ignore small areas of motion detection.
MOGThreshold float64 // Intensity value from the KNN motion detection algorithm that is considered motion. MOGThreshold float64 // Intensity value from the KNN motion detection algorithm that is considered motion.
MOGHistory uint // Length of MOG filter's history MOGHistory uint // Length of MOG filter's history.
// Difference filter parameters.
DiffThreshold float64 // Intensity value from the Difference motion detection algorithm that is considered motion.
// Basic filter parameters.
BasicThreshold int BasicThreshold int
BasicPixels int BasicPixels int
@ -313,63 +319,62 @@ type Config struct {
// Defines the rate at which frames from a file source are processed. // Defines the rate at which frames from a file source are processed.
FileFPS int FileFPS int
// Difference filter parameters.
DiffThreshold float64 // Intensity value from the Difference motion detection algorithm that is considered motion.
} }
// TypeData contains information about all of the variables that // TypeData contains information about all of the variables that
// can be set over the web. It is a psuedo const. // can be set over the web. It is a psuedo const.
var TypeData = map[string]string{ var TypeData = map[string]string{
"AutoWhiteBalance": "enum:off,auto,sun,cloud,shade,tungsten,fluorescent,incandescent,flash,horizon", "AutoWhiteBalance": "enum:off,auto,sun,cloud,shade,tungsten,fluorescent,incandescent,flash,horizon",
"BasicPixels": "int", "BasicPixels": "int",
"BasicThreshold": "int", "BasicThreshold": "int",
"BitDepth": "int", "BitDepth": "int",
"Brightness": "uint", "Brightness": "uint",
"BurstPeriod": "uint", "BurstPeriod": "uint",
"CameraChan": "int", "CameraChan": "int",
"CameraIP": "string", "CameraIP": "string",
"CBR": "bool", "CBR": "bool",
"ClipDuration": "uint", "ClipDuration": "uint",
"DiffThreshold": "float", "DiffThreshold": "float",
"Exposure": "enum:auto,night,nightpreview,backlight,spotlight,sports,snow,beach,verylong,fixedfps,antishake,fireworks", "Exposure": "enum:auto,night,nightpreview,backlight,spotlight,sports,snow,beach,verylong,fixedfps,antishake,fireworks",
"FileFPS": "int", "FileFPS": "int",
"Filters": "enums:NoOp,MOG,VariableFPS,KNN,Difference,Basic", "Filters": "enums:NoOp,MOG,VariableFPS,KNN,Difference,Basic",
"FrameRate": "uint", "FrameRate": "uint",
"Height": "uint", "Height": "uint",
"HorizontalFlip": "bool", "HorizontalFlip": "bool",
"HTTPAddress": "string", "HTTPAddress": "string",
"Input": "enum:raspivid,rtsp,v4l,file", "Input": "enum:raspivid,rtsp,v4l,file",
"InputCodec": "enum:H264,MJPEG", "InputCodec": "enum:H264,MJPEG",
"InputPath": "string", "InputPath": "string",
"KNNHistory": "uint", "KNNHistory": "uint",
"KNNKernel": "float", "KNNKernel": "float",
"KNNMinArea": "float", "KNNMinArea": "float",
"KNNThreshold": "float", "KNNThreshold": "float",
"logging": "enum:Debug,Info,Warning,Error,Fatal", "logging": "enum:Debug,Info,Warning,Error,Fatal",
"Loop": "bool", "Loop": "bool",
"MinFPS": "float", "MinFPS": "float",
"MinFrames": "uint", "MinFrames": "uint",
"mode": "enum:Normal,Paused,Burst,Loop", "mode": "enum:Normal,Paused,Burst,Loop",
"MOGHistory": "uint", "MOGHistory": "uint",
"MOGMinArea": "float", "MOGMinArea": "float",
"MOGThreshold": "float", "MOGThreshold": "float",
"MotionInterval": "int", "MotionDownscaling": "uint",
"Output": "enum:File,Http,Rtmp,Rtp", "MotionInterval": "int",
"OutputPath": "string", "Output": "enum:File,Http,Rtmp,Rtp",
"Outputs": "enums:File,Http,Rtmp,Rtp", "OutputPath": "string",
"Quantization": "uint", "Outputs": "enums:File,Http,Rtmp,Rtp",
"RBCapacity": "uint", "Quantization": "uint",
"RBMaxElements": "uint", "RBCapacity": "uint",
"RBWriteTimeout": "uint", "RBMaxElements": "uint",
"Rotation": "uint", "RBWriteTimeout": "uint",
"RTMPURL": "string", "Rotation": "uint",
"RTPAddress": "string", "RTMPURL": "string",
"Saturation": "int", "RTPAddress": "string",
"ShowWindows": "bool", "Saturation": "int",
"VBRBitrate": "int", "ShowWindows": "bool",
"VBRQuality": "enum:standard,fair,good,great,excellent", "VBRBitrate": "int",
"VerticalFlip": "bool", "VBRQuality": "enum:standard,fair,good,great,excellent",
"Width": "uint", "VerticalFlip": "bool",
"Width": "uint",
} }
// Validation errors. // Validation errors.
@ -544,6 +549,11 @@ func (c *Config) Validate() error {
c.BasicPixels = defaultBasicPixels c.BasicPixels = defaultBasicPixels
} }
if c.MotionDownscaling <= 0 {
c.logInvalidField("MotionDownscaling", defaultMotionDownscaling)
c.MotionDownscaling = defaultMotionDownscaling
}
if c.ShowWindows { if c.ShowWindows {
os, err := osName() os, err := osName()
if err != nil { if err != nil {

View File

@ -341,11 +341,11 @@ func (r *Revid) setupPipeline(mtsEnc func(dst io.WriteCloser, rate float64) (io.
case config.FilterNoOp: case config.FilterNoOp:
r.filters[i] = filter.NewNoOp(dst) r.filters[i] = filter.NewNoOp(dst)
case config.FilterMOG: case config.FilterMOG:
r.filters[i] = filter.NewMOG(dst, r.cfg.MOGMinArea, r.cfg.MOGThreshold, int(r.cfg.MOGHistory), r.cfg.ShowWindows, r.cfg.MotionInterval) r.filters[i] = filter.NewMOG(dst, r.cfg.MOGMinArea, r.cfg.MOGThreshold, int(r.cfg.MOGHistory), r.cfg.ShowWindows, r.cfg.MotionInterval, r.cfg.MotionDownscaling)
case config.FilterVariableFPS: case config.FilterVariableFPS:
r.filters[i] = filter.NewVariableFPS(dst, r.cfg.MinFPS, filter.NewMOG(dst, r.cfg.MOGMinArea, r.cfg.MOGThreshold, int(r.cfg.MOGHistory), r.cfg.ShowWindows, r.cfg.MotionInterval)) r.filters[i] = filter.NewVariableFPS(dst, r.cfg.MinFPS, filter.NewMOG(dst, r.cfg.MOGMinArea, r.cfg.MOGThreshold, int(r.cfg.MOGHistory), r.cfg.ShowWindows, r.cfg.MotionInterval, r.cfg.MotionDownscaling))
case config.FilterKNN: case config.FilterKNN:
r.filters[i] = filter.NewKNN(dst, r.cfg.KNNMinArea, r.cfg.KNNThreshold, int(r.cfg.KNNHistory), int(r.cfg.KNNKernel), r.cfg.ShowWindows, r.cfg.MotionInterval) r.filters[i] = filter.NewKNN(dst, r.cfg.KNNMinArea, r.cfg.KNNThreshold, int(r.cfg.KNNHistory), int(r.cfg.KNNKernel), r.cfg.ShowWindows, r.cfg.MotionInterval, r.cfg.MotionDownscaling)
case config.FilterDifference: case config.FilterDifference:
r.filters[i] = filter.NewDifference(dst, r.cfg.ShowWindows, r.cfg.DiffThreshold) r.filters[i] = filter.NewDifference(dst, r.cfg.ShowWindows, r.cfg.DiffThreshold)
case config.FilterBasic: case config.FilterBasic:
@ -904,6 +904,13 @@ func (r *Revid) Update(vars map[string]string) error {
if value == "Loop" { if value == "Loop" {
r.cfg.Loop = true r.cfg.Loop = true
} }
case "MotionDownscaling":
v, err := strconv.Atoi(value)
if err != nil {
r.cfg.Logger.Log(logger.Warning, pkg+"invalid MotionDownscaling var", "value", value)
break
}
r.cfg.MotionDownscaling = v
} }
} }
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))