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

a few small onvif fixes and relativemove debug

Browse Source
This commit is contained in:
Josh Hawkins 2023-11-11 06:20:24 -06:00
parent 563fdec211
commit 792e3aa490
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frigate/ptz/onvif.py
View File

@ -133,6 +133,7 @@ class OnvifController:
# setup relative moving request for autotracking # setup relative moving request for autotracking
move_request = ptz.create_type("RelativeMove") move_request = ptz.create_type("RelativeMove")
move_request.ProfileToken = profile.token move_request.ProfileToken = profile.token
logger.debug(f"{camera_name}: Relative move request: {move_request}")
if move_request.Translation is None and fov_space_id is not None: if move_request.Translation is None and fov_space_id is not None:
move_request.Translation = status.Position move_request.Translation = status.Position
move_request.Translation.PanTilt.space = ptz_config["Spaces"][ move_request.Translation.PanTilt.space = ptz_config["Spaces"][
@ -162,7 +163,10 @@ class OnvifController:
) )
if move_request.Speed is None: if move_request.Speed is None:
move_request.Speed = status.Position if status else None move_request.Speed = configs.DefaultPTZSpeed if configs else None
logger.debug(
f"{camera_name}: Relative move request after setup: {move_request}"
)
self.cams[camera_name]["relative_move_request"] = move_request self.cams[camera_name]["relative_move_request"] = move_request
# setup absolute moving request for autotracking zooming # setup absolute moving request for autotracking zooming
@ -207,7 +211,9 @@ class OnvifController:
self.config.cameras[camera_name].onvif.autotracking.zooming self.config.cameras[camera_name].onvif.autotracking.zooming
== ZoomingModeEnum.relative == ZoomingModeEnum.relative
): ):
self.config.cameras[camera_name].onvif.autotracking.zooming = False self.config.cameras[
camera_name
].onvif.autotracking.zooming = ZoomingModeEnum.disabled
logger.warning( logger.warning(
f"Disabling autotracking zooming for {camera_name}: Relative zoom not supported" f"Disabling autotracking zooming for {camera_name}: Relative zoom not supported"
) )
@ -222,7 +228,9 @@ class OnvifController:
self.cams[camera_name]["zoom_limits"] = configs.ZoomLimits self.cams[camera_name]["zoom_limits"] = configs.ZoomLimits
except Exception: except Exception:
if self.config.cameras[camera_name].onvif.autotracking.zooming: if self.config.cameras[camera_name].onvif.autotracking.zooming:
self.config.cameras[camera_name].onvif.autotracking.zooming = False self.config.cameras[
camera_name
].onvif.autotracking.zooming = ZoomingModeEnum.disabled
logger.warning( logger.warning(
f"Disabling autotracking zooming for {camera_name}: Absolute zoom not supported" f"Disabling autotracking zooming for {camera_name}: Absolute zoom not supported"
) )