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

better handle cases when zooming is disabled

Browse Source
This commit is contained in:
Josh Hawkins 2024-02-14 22:16:16 -06:00
parent d68bdcf72c
commit 421392c661
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
frigate/ptz/onvif.py
View File

@ -191,17 +191,15 @@ class OnvifController:
move_request.Translation.Zoom.space = ptz_config["Spaces"][ move_request.Translation.Zoom.space = ptz_config["Spaces"][
"RelativeZoomTranslationSpace" "RelativeZoomTranslationSpace"
][zoom_space_id]["URI"] ][zoom_space_id]["URI"]
else:
move_request.Translation.Zoom = []
except Exception: except Exception:
if ( self.config.cameras[
self.config.cameras[camera_name].onvif.autotracking.zooming camera_name
== ZoomingModeEnum.relative ].onvif.autotracking.zooming = ZoomingModeEnum.disabled
): logger.warning(
self.config.cameras[ f"Disabling autotracking zooming for {camera_name}: Relative zoom not supported"
camera_name )
].onvif.autotracking.zooming = ZoomingModeEnum.disabled
logger.warning(
f"Disabling autotracking zooming for {camera_name}: Relative zoom not supported"
)
if move_request.Speed is None: if move_request.Speed is None:
move_request.Speed = configs.DefaultPTZSpeed if configs else None move_request.Speed = configs.DefaultPTZSpeed if configs else None
@ -390,7 +388,11 @@ class OnvifController:
move_request.Translation.PanTilt.x = pan move_request.Translation.PanTilt.x = pan
move_request.Translation.PanTilt.y = tilt move_request.Translation.PanTilt.y = tilt
if "zoom-r" in self.cams[camera_name]["features"]: if (
"zoom-r" in self.cams[camera_name]["features"]
and self.config.cameras[camera_name].onvif.autotracking.zooming
== ZoomingModeEnum.relative
):
move_request.Speed = { move_request.Speed = {
"PanTilt": { "PanTilt": {
"x": speed, "x": speed,
@ -406,7 +408,11 @@ class OnvifController:
move_request.Translation.PanTilt.x = 0 move_request.Translation.PanTilt.x = 0
move_request.Translation.PanTilt.y = 0 move_request.Translation.PanTilt.y = 0
if "zoom-r" in self.cams[camera_name]["features"]: if (
"zoom-r" in self.cams[camera_name]["features"]
and self.config.cameras[camera_name].onvif.autotracking.zooming
== ZoomingModeEnum.relative
):
move_request.Translation.Zoom.x = 0 move_request.Translation.Zoom.x = 0
self.cams[camera_name]["active"] = False self.cams[camera_name]["active"] = False