administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-07-14 16:01:13 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix double event publishes for stationary objects with attributes

Browse Source
This commit is contained in:
Josh Hawkins 2026-05-07 12:59:16 -05:00
parent d8905e0dfa
commit b03959e45c
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frigate/track/tracked_object.py
View File

@ -330,7 +330,12 @@ class TrackedObject:
if self.obj_data["position_changes"] != obj_data["position_changes"]: if self.obj_data["position_changes"] != obj_data["position_changes"]:
significant_change = True significant_change = True
if self.obj_data["attributes"] != obj_data["attributes"]: # disappearance of a per-frame attribute can be caused by detection
# skipping the object on a frame (stationary objects on non-interval
# frames), so only flag when a new attribute label appears
prev_labels = {a["label"] for a in self.obj_data["attributes"]}
curr_labels = {a["label"] for a in obj_data["attributes"]}
if curr_labels - prev_labels:
significant_change = True significant_change = True
# if the state changed between stationary and active # if the state changed between stationary and active

22
frigate/video/detect.py
View File

@ -438,24 +438,22 @@ def process_frames(
else: else:
object_tracker.update_frame_times(frame_name, frame_time) object_tracker.update_frame_times(frame_name, frame_time)
# group the attribute detections based on what label they apply to
attribute_detections: dict[str, list[TrackedObjectAttribute]] = {}
for label, attribute_labels in attributes_map.items():
attribute_detections[label] = [
TrackedObjectAttribute(d)
for d in consolidated_detections
if d[0] in attribute_labels
]
# build detections # build detections
detections = {} detections = {}
for obj in object_tracker.tracked_objects.values(): for obj in object_tracker.tracked_objects.values():
detections[obj["id"]] = {**obj, "attributes": []} detections[obj["id"]] = {**obj, "attributes": []}
# find the best object for each attribute to be assigned to # assign each detected attribute to the best matching object.
# iterate consolidated_detections once so attributes that appear under
# multiple parent labels in attributes_map (e.g. license_plate is in
# both "car" and "motorcycle") are not appended more than once
all_objects: list[dict[str, Any]] = object_tracker.tracked_objects.values() all_objects: list[dict[str, Any]] = object_tracker.tracked_objects.values()
for attributes in attribute_detections.values(): detected_attributes = [
for attribute in attributes: TrackedObjectAttribute(d)
for d in consolidated_detections
if d[0] in all_attributes
]
for attribute in detected_attributes:
filtered_objects = filter( filtered_objects = filter(
lambda o: attribute.label in attributes_map.get(o["label"], []), lambda o: attribute.label in attributes_map.get(o["label"], []),
all_objects, all_objects,