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

Simplify loitering logic

Browse Source
This commit is contained in:
Nicolas Mowen 2024-10-10 06:13:54 -06:00
parent bc3a06178b
commit e203318ca6
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
frigate/review/maintainer.py
View File

@ -239,7 +239,11 @@ class ReviewSegmentMaintainer(threading.Thread):
) -> None: ) -> None:
"""Validate if existing review segment should continue.""" """Validate if existing review segment should continue."""
camera_config = self.config.cameras[segment.camera] camera_config = self.config.cameras[segment.camera]
active_objects = get_active_objects(frame_time, camera_config, objects)
# get active objects + objects loitering in loitering zones
active_objects = get_active_objects(
frame_time, camera_config, objects
) + get_loitering_objects(frame_time, camera_config, objects)
prev_data = segment.get_data(False) prev_data = segment.get_data(False)
has_activity = False has_activity = False
@ -304,37 +308,6 @@ class ReviewSegmentMaintainer(threading.Thread):
except FileNotFoundError: except FileNotFoundError:
return return
# check if there are any objects pending loitering on this camera
loitering_objects = get_loitering_objects(frame_time, camera_config, objects)
if loitering_objects:
has_activity = True
if frame_time > segment.last_update:
segment.last_update = frame_time
for object in loitering_objects:
# if object is alert label
# and has entered loitering zone
# mark this review as alert
if (
segment.severity != SeverityEnum.alert
and object["label"] in camera_config.review.alerts.labels
and (
len(object["current_zones"]) > 0
and set(object["current_zones"])
& set(camera_config.review.alerts.required_zones)
)
):
segment.severity = SeverityEnum.alert
should_update = True
# keep zones up to date
if len(object["current_zones"]) > 0:
for zone in object["current_zones"]:
if zone not in segment.zones:
segment.zones.append(zone)
if not has_activity: if not has_activity:
if not segment.has_frame: if not segment.has_frame:
try: try: