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

remove autotracking velocity changes

Browse Source
This commit is contained in:
Josh Hawkins 2023-11-01 15:44:30 -05:00
parent 2433b9e00a
commit 9cba0ad95f
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frigate/track/norfair_tracker.py
View File

@ -55,11 +55,7 @@ def distance(detection: np.array, estimate: np.array) -> float:
def frigate_distance(detection: Detection, tracked_object) -> float: def frigate_distance(detection: Detection, tracked_object) -> float:
# if we're actively autotracking an object return distance(detection.points, tracked_object.estimate)
if tracked_object.autotracking_estimate is not None:
return distance(detection.points, tracked_object.autotracking_estimate)
else:
return distance(detection.points, tracked_object.estimate)
class NorfairTracker(ObjectTracker): class NorfairTracker(ObjectTracker):
@ -76,7 +72,6 @@ class NorfairTracker(ObjectTracker):
self.detect_config = config.detect self.detect_config = config.detect
self.ptz_metrics = ptz_metrics self.ptz_metrics = ptz_metrics
self.ptz_autotracker_enabled = ptz_metrics["ptz_autotracker_enabled"] self.ptz_autotracker_enabled = ptz_metrics["ptz_autotracker_enabled"]
self.ptz_tracking_active = ptz_metrics["ptz_tracking_active"]
self.ptz_motion_estimator = {} self.ptz_motion_estimator = {}
self.camera_name = config.name self.camera_name = config.name
self.track_id_map = {} self.track_id_map = {}
@ -280,9 +275,6 @@ class NorfairTracker(ObjectTracker):
active_ids = [] active_ids = []
for t in tracked_objects: for t in tracked_objects:
estimate = tuple(t.estimate.flatten().astype(int)) estimate = tuple(t.estimate.flatten().astype(int))
autotracking_estimate = (
estimate if not self.ptz_tracking_active.is_set() else None
)
# keep the estimate within the bounds of the image # keep the estimate within the bounds of the image
estimate = ( estimate = (
max(0, estimate[0]), max(0, estimate[0]),
@ -293,7 +285,6 @@ class NorfairTracker(ObjectTracker):
obj = { obj = {
**t.last_detection.data, **t.last_detection.data,
"estimate": estimate, "estimate": estimate,
"autotracking_estimate": autotracking_estimate,
"estimate_velocity": t.estimate_velocity, "estimate_velocity": t.estimate_velocity,
} }
active_ids.append(t.global_id) active_ids.append(t.global_id)