jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-16 17:57:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ONVIF component to SUPPORT_STREAM (#22569)

Browse Source 
* Update Onvif component to SUPPORT_STREAM

* Update camera.py

* Update camera.py

* Update camera.py

Remove extra spaces.

* lookup URL when camera is added to hass and add extra guards
This commit is contained in:
drjared88 2019-03-31 16:12:55 -06:00 committed by Paulus Schoutsen
parent 755571abe3
commit e085383d2d
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
homeassistant/components/onvif/camera.py
View File

@ -13,7 +13,8 @@ import voluptuous as vol
from homeassistant.const import ( from homeassistant.const import (
CONF_NAME, CONF_HOST, CONF_USERNAME, CONF_PASSWORD, CONF_PORT, CONF_NAME, CONF_HOST, CONF_USERNAME, CONF_PASSWORD, CONF_PORT,
ATTR_ENTITY_ID) ATTR_ENTITY_ID)
from homeassistant.components.camera import Camera, PLATFORM_SCHEMA from homeassistant.components.camera import (
Camera, PLATFORM_SCHEMA, SUPPORT_STREAM)
from homeassistant.components.camera.const import DOMAIN from homeassistant.components.camera.const import DOMAIN
from homeassistant.components.ffmpeg import ( from homeassistant.components.ffmpeg import (
DATA_FFMPEG, CONF_EXTRA_ARGUMENTS) DATA_FFMPEG, CONF_EXTRA_ARGUMENTS)
@ -187,13 +188,14 @@ class ONVIFHassCamera(Camera):
self.hass.data[ONVIF_DATA] = {} self.hass.data[ONVIF_DATA] = {}
self.hass.data[ONVIF_DATA][ENTITIES] = [] self.hass.data[ONVIF_DATA][ENTITIES] = []
self.hass.data[ONVIF_DATA][ENTITIES].append(self) self.hass.data[ONVIF_DATA][ENTITIES].append(self)
await self.hass.async_add_executor_job(self.obtain_input_uri)
async def async_camera_image(self): async def async_camera_image(self):
"""Return a still image response from the camera.""" """Return a still image response from the camera."""
from haffmpeg.tools import ImageFrame, IMAGE_JPEG from haffmpeg.tools import ImageFrame, IMAGE_JPEG
if not self._input: if not self._input:
await self.hass.async_add_job(self.obtain_input_uri) await self.hass.async_add_executor_job(self.obtain_input_uri)
if not self._input: if not self._input:
return None return None
@ -210,7 +212,7 @@ class ONVIFHassCamera(Camera):
from haffmpeg.camera import CameraMjpeg from haffmpeg.camera import CameraMjpeg
if not self._input: if not self._input:
await self.hass.async_add_job(self.obtain_input_uri) await self.hass.async_add_executor_job(self.obtain_input_uri)
if not self._input: if not self._input:
return None return None
@ -228,6 +230,18 @@ class ONVIFHassCamera(Camera):
finally: finally:
await stream.close() await stream.close()
@property
def supported_features(self):
"""Return supported features."""
if self._input:
return SUPPORT_STREAM
return 0
@property
def stream_source(self):
"""Return the stream source."""
return self._input
@property @property
def name(self): def name(self):
"""Return the name of this camera.""" """Return the name of this camera."""