From 3572ef127e05bbe70c3031f4d0c9a8e5a9a43ce6 Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Thu, 22 May 2025 18:13:49 -0600 Subject: [PATCH] Handle updating objects config --- frigate/config/camera/updater.py | 3 +++ frigate/video.py | 11 +++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/frigate/config/camera/updater.py b/frigate/config/camera/updater.py index 5abca57eb..140e02207 100644 --- a/frigate/config/camera/updater.py +++ b/frigate/config/camera/updater.py @@ -17,6 +17,7 @@ class CameraConfigUpdateEnum(str, Enum): enabled = "enabled" motion = "motion" # includes motion and motion masks notifications = "notifications" + objects = "objects" record = "record" review = "review" snapshots = "snapshots" @@ -83,6 +84,8 @@ class CameraConfigUpdateSubscriber: config.motion = updated_config elif update_type == CameraConfigUpdateEnum.notifications: config.notifications = updated_config + elif update_type == CameraConfigUpdateEnum.objects: + config.objects = updated_config elif update_type == CameraConfigUpdateEnum.record: config.record = updated_config elif update_type == CameraConfigUpdateEnum.review: diff --git a/frigate/video.py b/frigate/video.py index 8ee974345..5fc70ca02 100755 --- a/frigate/video.py +++ b/frigate/video.py @@ -494,8 +494,6 @@ def track_camera( frame_queue = camera_metrics.frame_queue frame_shape = config.frame_shape - objects_to_track = config.objects.track - object_filters = config.objects.filters motion_detector = ImprovedMotionDetector( frame_shape, @@ -528,8 +526,6 @@ def track_camera( object_tracker, detected_objects_queue, camera_metrics, - objects_to_track, - object_filters, stop_event, ptz_metrics, region_grid, @@ -594,8 +590,6 @@ def process_frames( object_tracker: ObjectTracker, detected_objects_queue: Queue, camera_metrics: CameraMetrics, - objects_to_track: list[str], - object_filters, stop_event: MpEvent, ptz_metrics: PTZMetrics, region_grid: list[list[dict[str, Any]]], @@ -608,6 +602,7 @@ def process_frames( CameraConfigUpdateEnum.detect, CameraConfigUpdateEnum.enabled, CameraConfigUpdateEnum.motion, + CameraConfigUpdateEnum.objects, ], ) @@ -825,8 +820,8 @@ def process_frames( frame, model_config, region, - objects_to_track, - object_filters, + camera_config.objects.track, + camera_config.objects.filters, ) )