Update tester

cmd/thermal-recorder/cptvplaybacktester.go

@@ -28,6 +28,7 @@ import (
 	cptv "github.com/TheCacophonyProject/go-cptv"
 	"github.com/TheCacophonyProject/go-cptv/cptvframe"
 	"github.com/TheCacophonyProject/lepton3"
+	"gopkg.in/yaml.v1"
 
 	"github.com/TheCacophonyProject/thermal-recorder/motion"
 	"github.com/TheCacophonyProject/thermal-recorder/recorder"
@@ -154,7 +155,6 @@ func (cpt *CPTVPlaybackTester) Detect(filename string) *EventLoggingRecordingLis
 	listener.verbose = verbose
 	listener.framesHz = camera.FPS()
 	processor := motion.NewMotionProcessor(lepton3.ParseRawFrame, &cpt.config.Motion, &cpt.config.Recorder, &cpt.config.Location, listener, recorder, camera)
-
 	if err != nil {
 		log.Printf("Could not open file %v", err)
 	}
@@ -163,6 +163,14 @@ func (cpt *CPTVPlaybackTester) Detect(filename string) *EventLoggingRecordingLis
 	log.Printf("Device name: %v", reader.DeviceName())
 	log.Printf("Timestamp: %v", reader.Timestamp())
 
+	// load thresh used for recording
+	motionConfig := make(map[string]interface{})
+	err = yaml.Unmarshal([]byte(reader.MotionConfig()), &motionConfig)
+	if trigThresh, ok := motionConfig["triggeredthresh"]; ok {
+		processor.SetTempThresh(uint16(trigThresh.(int)))
+		log.Printf("Triggered thresh: %v", trigThresh)
+	}
+
 	fakeTime := time.Minute
 	frame := reader.EmptyFrame()
 	for {
@@ -183,9 +191,13 @@ func (cpt *CPTVPlaybackTester) Detect(filename string) *EventLoggingRecordingLis
 		if frame.Status.TimeOn == time.Duration(0) {
 			frame.Status.TimeOn = fakeTime
 		}
+		if frame.Status.BackgroundFrame {
+			processor.SetBackground(frame)
+		} else {
 
-		processor.ProcessFrame(frame)
-		listener.frameCount++
+			processor.ProcessFrame(frame)
+			listener.frameCount++
+		}
 	}
 }
 

motion/motion.go

@@ -29,10 +29,8 @@ import (
 // Field Correction.
 // TODO - this should probably be configurable (although 10s does seem right).
 const ffcPeriod = 10 * time.Second
-
 const debugLogSecs = 5
-const frameBackgroundWeighting = 0.99
-const weightEveryNFrames = 3
+const weightPercent = 0.002
 
 func NewMotionDetector(args config.ThermalMotion, previewFrames int, camera cptvframe.CameraSpec) *motionDetector {
 	d := new(motionDetector)
@@ -62,34 +60,35 @@ func NewMotionDetector(args config.ThermalMotion, previewFrames int, camera cptv
 	for i := range d.backgroundWeight {
 		d.backgroundWeight[i] = make([]float32, camera.ResX())
 	}
-
+	d.backgroundWeighting = weightPercent * float32(d.deltaThresh)
 	return d
 }
 
 type motionDetector struct {
-	flooredFrames    FrameLoop
-	diffFrames       FrameLoop
-	firstDiff        bool
-	dynamicThresh    bool
-	useOneDiff       bool
-	tempThresh       uint16
-	tempThreshMax    uint16
-	tempThreshMin    uint16
-	deltaThresh      uint16
-	countThresh      int
-	warmerOnly       bool
-	start            int
-	rowStop          int
-	columnStop       int
-	count            int
-	background       *cptvframe.Frame
-	backgroundWeight [][]float32
-	backgroundFrames int
-	debug            *debugTracker
-	previewFrames    int
-	numPixels        float64
-	affectedByFCC    bool
-	framesHz         int
+	flooredFrames       FrameLoop
+	diffFrames          FrameLoop
+	firstDiff           bool
+	dynamicThresh       bool
+	useOneDiff          bool
+	tempThresh          uint16
+	tempThreshMax       uint16
+	tempThreshMin       uint16
+	deltaThresh         uint16
+	countThresh         int
+	warmerOnly          bool
+	start               int
+	rowStop             int
+	columnStop          int
+	count               int
+	background          *cptvframe.Frame
+	backgroundWeight    [][]float32
+	backgroundFrames    int
+	backgroundWeighting float32
+	debug               *debugTracker
+	previewFrames       int
+	numPixels           float64
+	affectedByFCC       bool
+	framesHz            int
 }
 
 func (d *motionDetector) Reset(camera cptvframe.CameraSpec) {
@@ -278,7 +277,7 @@ func (d *motionDetector) updateBackground(new_frame *cptvframe.Frame, prevFFC bo
 				d.backgroundWeight[y][x] = 0
 				changed = true
 			} else {
-				weight += 0.1
+				weight += d.backgroundWeighting
 				if weight > math.MaxFloat32 {
 					weight = math.MaxFloat32
 				}
@@ -311,7 +310,6 @@ func absDiff(a, b uint16) uint16 {
 
 func warmerDiff(a, b uint16) uint16 {
 	d := int32(a) - int32(b)
-
 	if d < 0 {
 		return 0
 	}

motion/motionprocessor.go

@@ -86,6 +86,15 @@ type RecordingListener interface {
 	RecordingEnded()
 }
 
+func (d *MotionProcessor) SetTempThresh(tempThresh uint16) {
+	d.motionDetector.tempThresh = tempThresh
+	d.motionDetector.deltaThresh = 100
+}
+
+func (d *MotionProcessor) SetBackground(frame *cptvframe.Frame) {
+	d.motionDetector.background.Pix = frame.Pix
+}
+
 func (mp *MotionProcessor) Reset(camera cptvframe.CameraSpec) {
 	mp.stopRecording()
 	mp.motionDetector.Reset(camera)