administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-02 17:25:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cleanup config accessing

Browse Source
This commit is contained in:
Nick Mowen 2022-04-12 09:21:46 -06:00
parent 18dcaa6566
commit 37d358a799
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frigate/output.py
View File

@ -190,12 +190,7 @@ class BirdsEyeFrameManager:
channel_dims, channel_dims,
) )
def camera_active(self, camera_config, object_box_count, motion_box_count): def camera_active(self, mode, object_box_count, motion_box_count):
if camera_config:
mode = camera_config.mode
else:
mode = self.mode
if mode == BirdseyeModeEnum.continuous: if mode == BirdseyeModeEnum.continuous:
return True return True
@ -315,14 +310,15 @@ class BirdsEyeFrameManager:
return True return True
def update(self, camera, camera_config, object_count, motion_count, frame_time, frame) -> bool: def update(self, camera, object_count, motion_count, frame_time, frame) -> bool:
# don't process if birdseye is disabled for this camera # don't process if birdseye is disabled for this camera
if camera_config and not camera_config.enabled: camera_config = self.config.cameras[camera].birdseye
if not camera_config.enabled:
return False return False
# update the last active frame for the camera # update the last active frame for the camera
self.cameras[camera]["current_frame"] = frame_time self.cameras[camera]["current_frame"] = frame_time
if self.camera_active(camera_config, object_count, motion_count): if self.camera_active(camera_config.mode, object_count, motion_count):
self.cameras[camera]["last_active_frame"] = frame_time self.cameras[camera]["last_active_frame"] = frame_time
now = datetime.datetime.now().timestamp() now = datetime.datetime.now().timestamp()
@ -433,7 +429,6 @@ def output_frames(config: FrigateConfig, video_output_queue):
): ):
if birdseye_manager.update( if birdseye_manager.update(
camera, camera,
config.cameras[camera].birdseye,
len([o for o in current_tracked_objects if not o["stationary"]]), len([o for o in current_tracked_objects if not o["stationary"]]),
len(motion_boxes), len(motion_boxes),
frame_time, frame_time,