From 9d857b8a66f0dbdf66ee1379b4730a39a630b267 Mon Sep 17 00:00:00 2001
From: Scott <scott@ausocean.org>
Date: Tue, 31 Dec 2019 15:04:19 +1030
Subject: [PATCH] Created constants for the MOG filter

---
 filter/filters_circleci.go |  2 +-
 filter/mog.go              |  4 ++--
 revid/revid.go             | 12 +++++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/filter/filters_circleci.go b/filter/filters_circleci.go
index e9fc155a..f6d46082 100644
--- a/filter/filters_circleci.go
+++ b/filter/filters_circleci.go
@@ -32,7 +32,7 @@ import (
 )
 
 // NewMOGFilter returns a pointer to a new NoOp struct for testing purposes only.
-func NewMOGFilter(dst io.WriteCloser, area, threshold float64, history, kernelSize int, debug bool) *NoOp {
+func NewMOGFilter(dst io.WriteCloser, area, threshold float64, history int, debug bool) *NoOp {
 	return &NoOp{dst: dst}
 }
 
diff --git a/filter/mog.go b/filter/mog.go
index 283ea034..11bed5a6 100644
--- a/filter/mog.go
+++ b/filter/mog.go
@@ -48,9 +48,9 @@ type MOGFilter struct {
 }
 
 // NewMOGFilter returns a pointer to a new MOGFilter struct.
-func NewMOGFilter(dst io.WriteCloser, area, threshold float64, history, kernelSize int, debug bool) *MOGFilter {
+func NewMOGFilter(dst io.WriteCloser, area, threshold float64, history int, debug bool) *MOGFilter {
 	bs := gocv.NewBackgroundSubtractorMOG2WithParams(history, threshold, false)
-	k := gocv.GetStructuringElement(gocv.MorphRect, image.Pt(kernelSize, kernelSize))
+	k := gocv.GetStructuringElement(gocv.MorphRect, image.Pt(3, 3))
 	var windows []*gocv.Window
 	if debug {
 		windows = []*gocv.Window{gocv.NewWindow("Debug: Bounding boxes"), gocv.NewWindow("Debug: Motion")}
diff --git a/revid/revid.go b/revid/revid.go
index fd3f83cf..075034a1 100644
--- a/revid/revid.go
+++ b/revid/revid.go
@@ -76,13 +76,18 @@ const (
 	rtmpConnectionTimeout  = 10
 )
 
-// KNN filter properties
+// Motion filter parameters
 const (
 	knnMinArea     = 25.0
 	knnThreshold   = 300
 	knnHistory     = 300
 	knnKernel      = 9
 	knnShowWindows = true
+	minArea        = 25.0
+	threshold      = 20.0
+	history        = 500
+	showWindows    = true
+	minFPS         = 1.0
 )
 
 const pkg = "revid: "
@@ -341,11 +346,12 @@ func (r *Revid) setupPipeline(mtsEnc func(dst io.WriteCloser, rate float64) (io.
 	case config.FilterNoOp:
 		r.filter = filter.NewNoOp(r.encoders)
 	case config.FilterMOG:
-		r.filter = filter.NewMOGFilter(r.encoders, 25, 20, 500, 3, true)
+		r.filter = filter.NewMOGFilter(r.encoders, minArea, threshold, history, showWindows)
 	case config.FilterVariableFPS:
-		r.filter = filter.NewVariableFPSFilter(r.encoders, 1.0, filter.NewMOGFilter(r.encoders, 25, 20, 500, 3, true))
+		r.filter = filter.NewVariableFPSFilter(r.encoders, minFPS, filter.NewMOGFilter(r.encoders, minArea, threshold, history, showWindows))
 	case config.FilterKNN:
 		r.filter = filter.NewKNNFilter(r.encoders, knnMinArea, knnThreshold, knnHistory, knnKernel, knnShowWindows)
+
 	default:
 		panic("Undefined Filter")
 	}