Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-10-27 10:52:11 +01:00
Code Issues Projects Releases Wiki Activity

Fix birdseye (#15051)

Browse Source
This commit is contained in:
Nicolas Mowen 2024-11-18 08:38:58 -07:00 committed by GitHub
parent 474c248c9d
commit 26c3f9f914
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frigate/output/birdseye.py
View File

@ -388,7 +388,7 @@ class BirdsEyeFrameManager:
for cam, cam_data in self.cameras.items() for cam, cam_data in self.cameras.items()
if self.config.cameras[cam].birdseye.enabled if self.config.cameras[cam].birdseye.enabled
and cam_data["last_active_frame"] > 0 and cam_data["last_active_frame"] > 0
and cam_data["current_frame"] - cam_data["last_active_frame"] and cam_data["current_frame_time"] - cam_data["last_active_frame"]
< self.inactivity_threshold < self.inactivity_threshold
] ]
) )
@ -405,7 +405,7 @@ class BirdsEyeFrameManager:
limited_active_cameras = sorted( limited_active_cameras = sorted(
active_cameras, active_cameras,
key=lambda active_camera: ( key=lambda active_camera: (
self.cameras[active_camera]["current_frame"] self.cameras[active_camera]["current_frame_time"]
- self.cameras[active_camera]["last_active_frame"] - self.cameras[active_camera]["last_active_frame"]
), ),
) )
@ -517,7 +517,7 @@ class BirdsEyeFrameManager:
self.copy_to_position( self.copy_to_position(
position[1], position[1],
position[0], position[0],
frame, self.cameras[position[0]]["current_frame"],
) )
return True return True
@ -689,7 +689,8 @@ class BirdsEyeFrameManager:
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.copy()
self.cameras[camera]["current_frame_time"] = frame_time
if self.camera_active(camera_config.mode, 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
@ -755,7 +756,7 @@ class Birdseye:
current_tracked_objects: list[dict[str, any]], current_tracked_objects: list[dict[str, any]],
motion_boxes: list[list[int]], motion_boxes: list[list[int]],
frame_time: float, frame_time: float,
frame, frame: np.ndarray,
) -> None: ) -> None:
# check if there is an updated config # check if there is an updated config
while True: while True: