mirror of
https://github.com/blakeblackshear/frigate.git
synced 2024-11-21 19:07:46 +01:00
Small autotracking changes (#9571)
* ignore web-new * remove web-new * catch exceptions for unsupported cameras * don't split up large ptz movements * fix ruff
This commit is contained in:
parent
2d0864c723
commit
3df8b5829c
3
.gitignore
vendored
3
.gitignore
vendored
@ -14,9 +14,6 @@ frigate/version.py
|
||||
web/build
|
||||
web/node_modules
|
||||
web/coverage
|
||||
web-new/build
|
||||
web-new/node_modules
|
||||
web-new/coverage
|
||||
core
|
||||
!/web/**/*.ts
|
||||
.idea/*
|
@ -734,11 +734,12 @@ class PtzAutoTracker:
|
||||
and frame_time > self.ptz_metrics[camera]["ptz_stop_time"].value
|
||||
and not self.move_queue_locks[camera].locked()
|
||||
):
|
||||
# split up any large moves caused by velocity estimated movements
|
||||
# we can split up any large moves caused by velocity estimated movements if necessary
|
||||
# get an excess amount and assign it instead of 0 below
|
||||
while pan != 0 or tilt != 0 or zoom != 0:
|
||||
pan, pan_excess = split_value(pan)
|
||||
tilt, tilt_excess = split_value(tilt)
|
||||
zoom, zoom_excess = split_value(zoom, False)
|
||||
pan, _ = split_value(pan)
|
||||
tilt, _ = split_value(tilt)
|
||||
zoom, _ = split_value(zoom, False)
|
||||
|
||||
logger.debug(
|
||||
f"{camera}: Enqueue movement for frame time: {frame_time} pan: {pan}, tilt: {tilt}, zoom: {zoom}"
|
||||
@ -746,9 +747,10 @@ class PtzAutoTracker:
|
||||
move_data = (frame_time, pan, tilt, zoom)
|
||||
self.move_queues[camera].put(move_data)
|
||||
|
||||
pan = pan_excess
|
||||
tilt = tilt_excess
|
||||
zoom = zoom_excess
|
||||
# reset values to not split up large movements
|
||||
pan = 0
|
||||
tilt = 0
|
||||
zoom = 0
|
||||
|
||||
def _touching_frame_edges(self, camera, box):
|
||||
camera_config = self.config.cameras[camera]
|
||||
|
@ -528,8 +528,7 @@ class OnvifController:
|
||||
except Exception:
|
||||
pass # We're unsupported, that'll be reported in the next check.
|
||||
|
||||
# there doesn't seem to be an onvif standard with this optional parameter
|
||||
# some cameras can report MoveStatus with or without PanTilt or Zoom attributes
|
||||
try:
|
||||
pan_tilt_status = getattr(status.MoveStatus, "PanTilt", None)
|
||||
zoom_status = getattr(status.MoveStatus, "Zoom", None)
|
||||
|
||||
@ -542,7 +541,9 @@ class OnvifController:
|
||||
"IDLE",
|
||||
"MOVING",
|
||||
]:
|
||||
logger.error(
|
||||
raise Exception
|
||||
except Exception:
|
||||
logger.warning(
|
||||
f"Camera {camera_name} does not support the ONVIF GetStatus method. Autotracking will not function correctly and must be disabled in your config."
|
||||
)
|
||||
return
|
||||
|
Loading…
Reference in New Issue
Block a user