mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-08-04 13:47:37 +02:00
Tracking fixes (#16645)
* use config enabled check for ptz cam tracker * ensure we have an object match before accessing score history * add comment for clarity
This commit is contained in:
parent
124d92daa9
commit
b961235187
@ -263,12 +263,13 @@ class NorfairTracker(ObjectTracker):
|
|||||||
|
|
||||||
# Get the correct tracker for this object's label
|
# Get the correct tracker for this object's label
|
||||||
tracker = self.get_tracker(obj["label"])
|
tracker = self.get_tracker(obj["label"])
|
||||||
obj["score_history"] = [
|
obj_match = next(
|
||||||
p.data["score"]
|
(o for o in tracker.tracked_objects if o.global_id == track_id), None
|
||||||
for p in next(
|
)
|
||||||
(o for o in tracker.tracked_objects if o.global_id == track_id)
|
# if we don't have a match, we have a new object
|
||||||
).past_detections
|
obj["score_history"] = (
|
||||||
]
|
[p.data["score"] for p in obj_match.past_detections] if obj_match else []
|
||||||
|
)
|
||||||
self.tracked_objects[id] = obj
|
self.tracked_objects[id] = obj
|
||||||
self.disappeared[id] = 0
|
self.disappeared[id] = 0
|
||||||
self.positions[id] = {
|
self.positions[id] = {
|
||||||
@ -519,7 +520,11 @@ class NorfairTracker(ObjectTracker):
|
|||||||
default_detections.extend(dets)
|
default_detections.extend(dets)
|
||||||
|
|
||||||
# Update default tracker with untracked detections
|
# Update default tracker with untracked detections
|
||||||
mode = "ptz" if self.ptz_metrics.autotracker_enabled.value else "static"
|
mode = (
|
||||||
|
"ptz"
|
||||||
|
if self.camera_config.onvif.autotracking.enabled_in_config
|
||||||
|
else "static"
|
||||||
|
)
|
||||||
tracked_objects = self.default_tracker[mode].update(
|
tracked_objects = self.default_tracker[mode].update(
|
||||||
detections=default_detections, coord_transformations=coord_transformations
|
detections=default_detections, coord_transformations=coord_transformations
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user