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

more cleanup

Browse Source
This commit is contained in:
Josh Hawkins 2023-10-01 21:41:37 -05:00
parent 257757d04b
commit dbae51ca9a
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
frigate/ptz/autotrack.py
View File

@ -256,7 +256,7 @@ class PtzAutoTracker:
self.autotracker_init[camera_name] = True self.autotracker_init[camera_name] = True
def write_config(self, camera): def _write_config(self, camera):
config_file = os.environ.get("CONFIG_FILE", f"{CONFIG_DIR}/config.yml") config_file = os.environ.get("CONFIG_FILE", f"{CONFIG_DIR}/config.yml")
logger.debug( logger.debug(
@ -370,7 +370,7 @@ class PtzAutoTracker:
f"New regression parameters - intercept: {self.intercept[camera]}, coefficients: {self.move_coefficients[camera]}" f"New regression parameters - intercept: {self.intercept[camera]}, coefficients: {self.move_coefficients[camera]}"
) )
self.write_config(camera) self._write_config(camera)
def _predict_movement_time(self, camera, pan, tilt): def _predict_movement_time(self, camera, pan, tilt):
combined_movement = abs(pan) + abs(tilt) combined_movement = abs(pan) + abs(tilt)
@ -402,6 +402,7 @@ class PtzAutoTracker:
if ( if (
self.config.cameras[camera].onvif.autotracking.zooming self.config.cameras[camera].onvif.autotracking.zooming
== ZoomingModeEnum.relative == ZoomingModeEnum.relative
# 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.onvif._move_relative(camera, pan, tilt, zoom, 1) self.onvif._move_relative(camera, pan, tilt, zoom, 1)
@ -705,21 +706,17 @@ class PtzAutoTracker:
obj, obj,
obj.obj_data["box"], obj.obj_data["box"],
): ):
self._enqueue_move( zoom = self.ptz_metrics[camera]["ptz_zoom_level"].value - 0.1
camera,
self.ptz_metrics[camera]["ptz_frame_time"].value,
0,
0,
self.ptz_metrics[camera]["ptz_zoom_level"].value - 0.1,
)
else: else:
self._enqueue_move( zoom = self.ptz_metrics[camera]["ptz_zoom_level"].value + 0.1
camera,
self.ptz_metrics[camera]["ptz_frame_time"].value, self._enqueue_move(
0, camera,
0, self.ptz_metrics[camera]["ptz_frame_time"].value,
self.ptz_metrics[camera]["ptz_zoom_level"].value + 0.1, 0,
) 0,
zoom,
)
def autotrack_object(self, camera, obj): def autotrack_object(self, camera, obj):
camera_config = self.config.cameras[camera] camera_config = self.config.cameras[camera]
@ -732,8 +729,8 @@ class PtzAutoTracker:
logger.debug("Calibrating camera") logger.debug("Calibrating camera")
return return
# either this is a brand new object that's on our camera, has our label, entered the zone, is not a false positive, # this is a brand new object that's on our camera, has our label, entered the zone,
# and is not initially motionless - or one we're already tracking, which assumes all those things are already true # is not a false positive, and is not initially motionless
if ( if (
# new object # new object
self.tracked_object[camera] is None self.tracked_object[camera] is None
@ -788,11 +785,6 @@ class PtzAutoTracker:
self.tracked_object_previous[camera] = copy.deepcopy(obj) self.tracked_object_previous[camera] = copy.deepcopy(obj)
self.previous_frame_time[camera] = obj.obj_data["frame_time"] self.previous_frame_time[camera] = obj.obj_data["frame_time"]
# if our score history shows the last 5 detections are 0, zoom to see if we can find our lost object
if all(x == 0.0 for x in obj.score_history[-5:]):
logger.debug(f"Object {obj.obj_data['id']} is lost")
self._lost_object_zoom(camera, obj)
return return
if ( if (