diff --git a/frigate/ptz/autotrack.py b/frigate/ptz/autotrack.py index 70b942ee3..ee1d4715e 100644 --- a/frigate/ptz/autotrack.py +++ b/frigate/ptz/autotrack.py @@ -63,7 +63,9 @@ class PtzMotionEstimator: self.ptz_metrics["ptz_reset"].set() logger.debug(f"{config.name}: Motion estimator init") - def motion_estimator(self, detections, frame_name, frame_time, camera): + def motion_estimator( + self, detections, frame_name: str, frame_time: int, camera: str + ): # If we've just started up or returned to our preset, reset motion estimator for new tracking session if self.ptz_metrics["ptz_reset"].is_set(): self.ptz_metrics["ptz_reset"].clear() diff --git a/frigate/record/maintainer.py b/frigate/record/maintainer.py index 188c1c3eb..a458f0da8 100644 --- a/frigate/record/maintainer.py +++ b/frigate/record/maintainer.py @@ -480,6 +480,7 @@ class RecordingMaintainer(threading.Thread): if topic == DetectionTypeEnum.video: ( camera, + _, frame_time, current_tracked_objects, motion_boxes, diff --git a/frigate/track/norfair_tracker.py b/frigate/track/norfair_tracker.py index 6cc94d97a..9f4ca9075 100644 --- a/frigate/track/norfair_tracker.py +++ b/frigate/track/norfair_tracker.py @@ -285,7 +285,9 @@ class NorfairTracker(ObjectTracker): ] self.match_and_update(frame_name, frame_time, detections=detections) - def match_and_update(self, frame_name, frame_time, detections): + def match_and_update( + self, frame_name: str, frame_time: float, detections: list[tuple] + ): norfair_detections = [] for obj in detections: diff --git a/frigate/video.py b/frigate/video.py index 6789bb853..a2b4a9d34 100755 --- a/frigate/video.py +++ b/frigate/video.py @@ -591,7 +591,7 @@ def process_frames( # if detection is disabled if not detect_config.enabled: - object_tracker.match_and_update(frame_time, []) + object_tracker.match_and_update(frame_name, frame_time, []) else: # get stationary object ids # check every Nth frame for stationary objects @@ -715,7 +715,7 @@ def process_frames( if d[0] not in ALL_ATTRIBUTE_LABELS ] # now that we have refined our detections, we need to track objects - object_tracker.match_and_update(frame_time, tracked_detections) + object_tracker.match_and_update(frame_name, frame_time, tracked_detections) # else, just update the frame times for the stationary objects else: object_tracker.update_frame_times(frame_name, frame_time)