Skip to content
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

ONVIF Camera added Error handling and rtsp authentication. #11129

Merged
merged 15 commits into from
Feb 17, 2018
Merged

ONVIF Camera added Error handling and rtsp authentication. #11129

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0788946
added Error handling and rtsp authentication.
matt2005 Dec 13, 2017
f239b7a
Fixed pep8 errors
matt2005 Dec 13, 2017
50f1b4a
remove unnessary imports
matt2005 Dec 13, 2017
04328e0
fixed accessing protected member
matt2005 Dec 13, 2017
793c0b4
removed unnecessary profile token
matt2005 Dec 14, 2017
ffff1cb
tidied up StreamSetup
matt2005 Dec 14, 2017
79d4b29
added Error handling and rtsp authentication.
matt2005 Dec 13, 2017
5c736e3
Fixed pep8 errors
matt2005 Dec 13, 2017
44de4a0
remove unnessary imports
matt2005 Dec 13, 2017
91dac80
fixed accessing protected member
matt2005 Dec 13, 2017
8e28606
removed unnecessary profile token
matt2005 Dec 14, 2017
0ceae2b
tidied up StreamSetup
matt2005 Dec 14, 2017
b55ebd7
Fixed merge error
matt2005 Jan 17, 2018
06404c7
Merge branch 'dev' of https://github.com/matt2005/home-assistant into…
matt2005 Jan 17, 2018
282de4a
renamed class as it clashed with the modules class
matt2005 Jan 17, 2018
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
39 changes: 24 additions & 15 deletions homeassistant/components/camera/onvif.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"""
import asyncio
import logging
import os

import voluptuous as vol

Expand Down Expand Up @@ -48,30 +47,40 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
"""Set up a ONVIF camera."""
if not hass.data[DATA_FFMPEG].async_run_test(config.get(CONF_HOST)):
return
async_add_devices([ONVIFCamera(hass, config)])
async_add_devices([ONVIFHassCamera(hass, config)])


class ONVIFCamera(Camera):
class ONVIFHassCamera(Camera):
"""An implementation of an ONVIF camera."""

def __init__(self, hass, config):
"""Initialize a ONVIF camera."""
from onvif import ONVIFService
import onvif
from onvif import ONVIFCamera
super().__init__()

self._name = config.get(CONF_NAME)
self._ffmpeg_arguments = config.get(CONF_EXTRA_ARGUMENTS)
media = ONVIFService(
'http://{}:{}/onvif/device_service'.format(
config.get(CONF_HOST), config.get(CONF_PORT)),
config.get(CONF_USERNAME),
config.get(CONF_PASSWORD),
'{}/wsdl/media.wsdl'.format(os.path.dirname(onvif.__file__))
)
self._input = media.GetStreamUri().Uri
_LOGGER.debug("ONVIF Camera Using the following URL for %s: %s",
self._name, self._input)
self._input = None
try:
_LOGGER.debug("Connecting with ONVIF Camera: %s on port %s",
config.get(CONF_HOST), config.get(CONF_PORT))
media_service = ONVIFCamera(
config.get(CONF_HOST), config.get(CONF_PORT),
config.get(CONF_USERNAME), config.get(CONF_PASSWORD)
).create_media_service()
stream_uri = media_service.GetStreamUri(
{'StreamSetup': {'Stream': 'RTP-Unicast', 'Transport': 'RTSP'}}
)
self._input = stream_uri.Uri.replace(
'rtsp://', 'rtsp://{}:{}@'.format(
config.get(CONF_USERNAME),
config.get(CONF_PASSWORD)), 1)
_LOGGER.debug(
"ONVIF Camera Using the following URL for %s: %s",
self._name, self._input)
except Exception as err:
_LOGGER.error("Unable to communicate with ONVIF Camera: %s", err)
raise

@asyncio.coroutine
def async_camera_image(self):
Expand Down