Skip to content

Fix ONVIF PTZ and profile encoding issues #36006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hunterjm merged 5 commits into from
May 23, 2020
Merged

Fix ONVIF PTZ and profile encoding issues #36006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa0f0ef
allow lib to create AsyncTransport
hunterjm May 21, 2020
887a7a1
fix transport close issue
hunterjm May 21, 2020
abbf538
fix zoom only cameras without PTZ presets
hunterjm May 22, 2020
8a5c37a
catch profiles without encoding configuration
hunterjm May 22, 2020
0fc20f9
also catch ServerDisconnectedError for ptz
hunterjm May 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion homeassistant/components/onvif/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ async def async_step_profiles(self, user_input=None):
media_service = device.create_media_service()
profiles = await media_service.GetProfiles()
h264 = any(
profile.VideoEncoderConfiguration.Encoding == "H264"
profile.VideoEncoderConfiguration
and profile.VideoEncoderConfiguration.Encoding == "H264"
for profile in profiles
)

Expand Down
15 changes: 11 additions & 4 deletions homeassistant/components/onvif/device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,10 @@ async def async_get_profiles(self) -> List[Profile]:
profiles = []
for key, onvif_profile in enumerate(result):
# Only add H264 profiles
if onvif_profile.VideoEncoderConfiguration.Encoding != "H264":
if (
not onvif_profile.VideoEncoderConfiguration
or onvif_profile.VideoEncoderConfiguration.Encoding != "H264"
):
continue

profile = Profile(
Expand All @@ -282,9 +285,13 @@ async def async_get_profiles(self) -> List[Profile]:
is not None,
)

ptz_service = self.device.create_ptz_service()
presets = await ptz_service.GetPresets(profile.token)
profile.ptz.presets = [preset.token for preset in presets]
try:
ptz_service = self.device.create_ptz_service()
presets = await ptz_service.GetPresets(profile.token)
profile.ptz.presets = [preset.token for preset in presets]
except (Fault, ServerDisconnectedError):
# It's OK if Presets aren't supported
profile.ptz.presets = []

profiles.append(profile)

Expand Down