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

only update target box if we actually zoom

Browse Source
This commit is contained in:
Josh Hawkins 2023-10-07 12:51:33 -05:00
parent 9d2937e681
commit cf387cd9c8
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frigate/ptz/autotrack.py
View File

@ -387,6 +387,10 @@ class PtzAutoTracker:
return np.dot(self.move_coefficients[camera], input_data) return np.dot(self.move_coefficients[camera], input_data)
def _process_move_queue(self, camera): def _process_move_queue(self, camera):
camera_config = self.config.cameras[camera]
camera_width = camera_config.frame_shape[1]
camera_height = camera_config.frame_shape[0]
while True: while True:
move_data = self.move_queues[camera].get() move_data = self.move_queues[camera].get()
@ -413,7 +417,11 @@ class PtzAutoTracker:
# this enables us to absolutely zoom if we lost an object # this enables us to absolutely zoom if we lost an object
and self.tracked_object[camera] is not None and self.tracked_object[camera] is not None
): ):
self.previous_target_box[camera] = self.tracked_object[
camera
].obj_data["area"] / (camera_width * camera_height)
self.onvif._move_relative(camera, pan, tilt, zoom, 1) self.onvif._move_relative(camera, pan, tilt, zoom, 1)
else: else:
if pan != 0 or tilt != 0: if pan != 0 or tilt != 0:
self.onvif._move_relative(camera, pan, tilt, 0, 1) self.onvif._move_relative(camera, pan, tilt, 0, 1)
@ -426,6 +434,9 @@ class PtzAutoTracker:
zoom > 0 zoom > 0
and self.ptz_metrics[camera]["ptz_zoom_level"].value != zoom and self.ptz_metrics[camera]["ptz_zoom_level"].value != zoom
): ):
self.previous_target_box[camera] = self.tracked_object[
camera
].obj_data["area"] / (camera_width * camera_height)
self.onvif._zoom_absolute(camera, zoom, 1) self.onvif._zoom_absolute(camera, zoom, 1)
# Wait until the camera finishes moving # Wait until the camera finishes moving
@ -674,7 +685,6 @@ class PtzAutoTracker:
and not at_max_zoom and not at_max_zoom
and zoom_in_hysteresis and zoom_in_hysteresis
): ):
self.previous_target_box[camera] = target_box
return True return True
# Zoom out conditions # Zoom out conditions
@ -685,7 +695,6 @@ class PtzAutoTracker:
or (not below_dimension_threshold and not below_distance_threshold) or (not below_dimension_threshold and not below_distance_threshold)
and not at_min_zoom and not at_min_zoom
): ):
self.previous_target_box[camera] = target_box
return False return False
# Don't zoom at all # Don't zoom at all