administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-01-22 20:18:30 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Refactor timeline event handling to allow multiple timeline entries per update

Browse Source
This commit is contained in:
Josh Hawkins 2025-12-19 18:23:12 -06:00
parent 43a0d4541f
commit 2b489fa76d
1 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
frigate/timeline.py
View File

@ -86,11 +86,11 @@ class TimelineProcessor(threading.Thread):
event_data: dict[Any, Any], event_data: dict[Any, Any],
) -> bool: ) -> bool:
"""Handle object detection.""" """Handle object detection."""
save = False
camera_config = self.config.cameras[camera] camera_config = self.config.cameras[camera]
event_id = event_data["id"] event_id = event_data["id"]
timeline_entry = { # Base timeline entry data that all entries will share
base_entry = {
Timeline.timestamp: event_data["frame_time"], Timeline.timestamp: event_data["frame_time"],
Timeline.camera: camera, Timeline.camera: camera,
Timeline.source: "tracked_object", Timeline.source: "tracked_object",
@ -123,40 +123,64 @@ class TimelineProcessor(threading.Thread):
e[Timeline.data]["sub_label"] = event_data["sub_label"] e[Timeline.data]["sub_label"] = event_data["sub_label"]
if event_type == EventStateEnum.start: if event_type == EventStateEnum.start:
timeline_entry = base_entry.copy()
timeline_entry[Timeline.class_type] = "visible" timeline_entry[Timeline.class_type] = "visible"
save = True self.insert_or_save(timeline_entry, prev_event_data, event_data)
elif event_type == EventStateEnum.update: elif event_type == EventStateEnum.update:
# Check all conditions and create timeline entries for each change
entries_to_save = []
# Check for zone changes
prev_zones = set(prev_event_data["current_zones"])
current_zones = set(event_data["current_zones"])
zones_changed = prev_zones != current_zones
# Only save "entered_zone" events when the object is actually IN zones
if ( if (
len(prev_event_data["current_zones"]) < len(event_data["current_zones"]) zones_changed
and not event_data["stationary"] and not event_data["stationary"]
and len(current_zones) > 0
): ):
timeline_entry[Timeline.class_type] = "entered_zone" zone_entry = base_entry.copy()
timeline_entry[Timeline.data]["zones"] = event_data["current_zones"] zone_entry[Timeline.class_type] = "entered_zone"
save = True zone_entry[Timeline.data] = base_entry[Timeline.data].copy()
elif prev_event_data["stationary"] != event_data["stationary"]: zone_entry[Timeline.data]["zones"] = event_data["current_zones"]
timeline_entry[Timeline.class_type] = ( entries_to_save.append(zone_entry)
# Check for stationary status change
if prev_event_data["stationary"] != event_data["stationary"]:
stationary_entry = base_entry.copy()
stationary_entry[Timeline.class_type] = (
"stationary" if event_data["stationary"] else "active" "stationary" if event_data["stationary"] else "active"
) )
save = True stationary_entry[Timeline.data] = base_entry[Timeline.data].copy()
elif prev_event_data["attributes"] == {} and event_data["attributes"] != {}: entries_to_save.append(stationary_entry)
timeline_entry[Timeline.class_type] = "attribute"
timeline_entry[Timeline.data]["attribute"] = list( # Check for new attributes
if prev_event_data["attributes"] == {} and event_data["attributes"] != {}:
attribute_entry = base_entry.copy()
attribute_entry[Timeline.class_type] = "attribute"
attribute_entry[Timeline.data] = base_entry[Timeline.data].copy()
attribute_entry[Timeline.data]["attribute"] = list(
event_data["attributes"].keys() event_data["attributes"].keys()
)[0] )[0]
if len(event_data["current_attributes"]) > 0: if len(event_data["current_attributes"]) > 0:
timeline_entry[Timeline.data]["attribute_box"] = to_relative_box( attribute_entry[Timeline.data]["attribute_box"] = to_relative_box(
camera_config.detect.width, camera_config.detect.width,
camera_config.detect.height, camera_config.detect.height,
event_data["current_attributes"][0]["box"], event_data["current_attributes"][0]["box"],
) )
save = True entries_to_save.append(attribute_entry)
elif event_type == EventStateEnum.end:
timeline_entry[Timeline.class_type] = "gone"
save = True
if save: # Save all entries
for entry in entries_to_save:
self.insert_or_save(entry, prev_event_data, event_data)
elif event_type == EventStateEnum.end:
timeline_entry = base_entry.copy()
timeline_entry[Timeline.class_type] = "gone"
self.insert_or_save(timeline_entry, prev_event_data, event_data) self.insert_or_save(timeline_entry, prev_event_data, event_data)
def handle_api_entry( def handle_api_entry(