administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-06 19:25:22 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

recalc with exponent

Browse Source
This commit is contained in:
Josh Hawkins 2023-10-02 21:31:32 -05:00
parent 8dae43fbb6
commit 4fa9f35b0a
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
frigate/ptz/autotrack.py
View File

@ -693,10 +693,6 @@ class PtzAutoTracker:
def _get_zoom_amount(self, camera, obj, predicted_box): def _get_zoom_amount(self, camera, obj, predicted_box):
camera_config = self.config.cameras[camera] camera_config = self.config.cameras[camera]
# frame width and height
camera_width = camera_config.frame_shape[1]
camera_height = camera_config.frame_shape[0]
zoom = 0 zoom = 0
# absolute zooming separately from pan/tilt # absolute zooming separately from pan/tilt
@ -730,13 +726,7 @@ class PtzAutoTracker:
if self.tracked_object_previous[camera] is None: if self.tracked_object_previous[camera] is None:
zoom = 0 zoom = 0
else: else:
zoom = min( zoom = zoom * (1 / self.zoom_factor[camera]) ** 1.5
obj.obj_data["area"]
/ (camera_width * camera_height)
* 100
* self.zoom_factor[camera],
1,
)
# test if we need to zoom out # test if we need to zoom out
if not self._should_zoom_in( if not self._should_zoom_in(
@ -746,7 +736,7 @@ class PtzAutoTracker:
if camera_config.onvif.autotracking.movement_weights if camera_config.onvif.autotracking.movement_weights
else obj.obj_data["box"], else obj.obj_data["box"],
): ):
zoom = max(-zoom * (1 / self.zoom_factor[camera]), -1) zoom = -zoom
return zoom return zoom
@ -902,17 +892,17 @@ class PtzAutoTracker:
if not self.ptz_metrics[camera]["ptz_stopped"].is_set(): if not self.ptz_metrics[camera]["ptz_stopped"].is_set():
self.onvif.get_camera_status(camera) self.onvif.get_camera_status(camera)
if ( # if (
self.tracked_object[camera] is None # self.tracked_object[camera] is None
and self.tracked_object_previous[camera] is not None # and self.tracked_object_previous[camera] is not None
and ( # and (
# might want to use a different timestamp here? # # might want to use a different timestamp here?
self.ptz_metrics[camera]["ptz_frame_time"].value # self.ptz_metrics[camera]["ptz_frame_time"].value
- self.tracked_object_previous[camera].obj_data["frame_time"] # - self.tracked_object_previous[camera].obj_data["frame_time"]
< autotracker_config.timeout # < autotracker_config.timeout
) # )
): # ):
self._lost_object_zoom(camera, self.tracked_object_previous[camera]) # self._lost_object_zoom(camera, self.tracked_object_previous[camera])
# return to preset if tracking is over # return to preset if tracking is over
if ( if (