Fix max_frames, improve stationary objects in masked areas (#6815)

* fix issue with max_frames

* dont consider stationary until the threshold

* require a stationary interval

* try to fix formatter issues

frigate/config.py

@@ -13,8 +13,6 @@ from pydantic.fields import PrivateAttr
 
 from frigate.const import CACHE_DIR, DEFAULT_DB_PATH, REGEX_CAMERA_NAME, YAML_EXT
 from frigate.detectors import DetectorConfig, ModelConfig
-from frigate.detectors.detector_config import InputTensorEnum  # noqa: F401
-from frigate.detectors.detector_config import PixelFormatEnum  # noqa: F401
 from frigate.detectors.detector_config import BaseDetectorConfig
 from frigate.ffmpeg_presets import (
     parse_preset_hardware_acceleration_decode,
@@ -251,9 +249,8 @@ class StationaryMaxFramesConfig(FrigateBaseModel):
 
 class StationaryConfig(FrigateBaseModel):
     interval: Optional[int] = Field(
-        default=0,
         title="Frame interval for checking stationary objects.",
-        ge=0,
+        gt=0,
     )
     threshold: Optional[int] = Field(
         title="Number of frames without a position change for an object to be considered stationary",
@@ -963,6 +960,9 @@ class FrigateConfig(FrigateBaseModel):
             stationary_threshold = camera_config.detect.fps * 10
             if camera_config.detect.stationary.threshold is None:
                 camera_config.detect.stationary.threshold = stationary_threshold
+            # default to the stationary_threshold if not defined
+            if camera_config.detect.stationary.interval is None:
+                camera_config.detect.stationary.interval = stationary_threshold
 
             # FFMPEG input substitution
             for input in camera_config.ffmpeg.inputs:

frigate/object_detection.py

@@ -10,8 +10,8 @@ from abc import ABC, abstractmethod
 import numpy as np
 from setproctitle import setproctitle
 
-from frigate.config import InputTensorEnum
 from frigate.detectors import create_detector
+from frigate.detectors.detector_config import InputTensorEnum
 from frigate.util import EventsPerSecond, SharedMemoryFrameManager, listen, load_labels
 
 logger = logging.getLogger(__name__)

frigate/test/test_object_detector.py

@@ -6,8 +6,9 @@ from pydantic import parse_obj_as
 
 import frigate.detectors as detectors
 import frigate.object_detection
-from frigate.config import DetectorConfig, InputTensorEnum, ModelConfig
+from frigate.config import DetectorConfig, ModelConfig
 from frigate.detectors import DetectorTypeEnum
+from frigate.detectors.detector_config import InputTensorEnum
 
 
 class TestLocalObjectDetector(unittest.TestCase):

frigate/track/norfair_tracker.py

@@ -91,9 +91,13 @@ class NorfairTracker(ObjectTracker):
             "ymax": self.detect_config.height,
         }
 
-    def deregister(self, id):
+    def deregister(self, id, track_id):
         del self.tracked_objects[id]
         del self.disappeared[id]
+        self.tracker.tracked_objects = [
+            o for o in self.tracker.tracked_objects if o.global_id != track_id
+        ]
+        del self.track_id_map[track_id]
 
     # tracks the current position of the object based on the last N bounding boxes
     # returns False if the object has moved outside its previous position
@@ -167,7 +171,7 @@ class NorfairTracker(ObjectTracker):
         if self.update_position(id, obj["box"]):
             self.tracked_objects[id]["motionless_count"] += 1
             if self.is_expired(id):
-                self.deregister(id)
+                self.deregister(id, track_id)
                 return
         else:
             # register the first position change and then only increment if
@@ -261,8 +265,7 @@ class NorfairTracker(ObjectTracker):
         # clear expired tracks
         expired_ids = [k for k in self.track_id_map.keys() if k not in active_ids]
         for e_id in expired_ids:
-            self.deregister(self.track_id_map[e_id])
-            del self.track_id_map[e_id]
+            self.deregister(self.track_id_map[e_id], e_id)
 
     def debug_draw(self, frame, frame_time):
         active_detections = [

frigate/video.py

@@ -14,8 +14,9 @@ import cv2
 import numpy as np
 from setproctitle import setproctitle
 
-from frigate.config import CameraConfig, DetectConfig, PixelFormatEnum
+from frigate.config import CameraConfig, DetectConfig
 from frigate.const import CACHE_DIR
+from frigate.detectors.detector_config import PixelFormatEnum
 from frigate.log import LogPipe
 from frigate.motion import MotionDetector
 from frigate.motion.improved_motion import ImprovedMotionDetector
@@ -769,8 +770,8 @@ def process_frames(
             stationary_object_ids = [
                 obj["id"]
                 for obj in object_tracker.tracked_objects.values()
-                # if there hasn't been motion for 10 frames
-                if obj["motionless_count"] >= 10
+                # if it has exceeded the stationary threshold
+                if obj["motionless_count"] >= detect_config.stationary.threshold
                 # and it isn't due for a periodic check
                 and (
                     detect_config.stationary.interval == 0