evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add image support to nest SDM api (#42556)

Browse source
This commit is contained in:
Allen Porter 2020-11-03 00:31:43 -08:00 • committed by GitHub
parent 744e4378ff
commit 89a5c9fcac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 178 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

18
homeassistant/components/ffmpeg/camera.py
View file

@ -1,8 +1,7 @@
"""Support for Cameras with FFmpeg as decoder."""
import asyncio
from haffmpeg.camera import CameraMjpeg
from haffmpeg.tools import IMAGE_JPEG, ImageFrame
from haffmpeg.tools import IMAGE_JPEG
import voluptuous as vol
from homeassistant.components.camera import PLATFORM_SCHEMA, SUPPORT_STREAM, Camera
@ -10,7 +9,7 @@ from homeassistant.const import CONF_NAME
from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
import homeassistant.helpers.config_validation as cv
from . import CONF_EXTRA_ARGUMENTS, CONF_INPUT, DATA_FFMPEG
from . import CONF_EXTRA_ARGUMENTS, CONF_INPUT, DATA_FFMPEG, async_get_image
DEFAULT_NAME = "FFmpeg"
DEFAULT_ARGUMENTS = "-pred 1"
@ -52,15 +51,12 @@ class FFmpegCamera(Camera):
async def async_camera_image(self):
"""Return a still image response from the camera."""
ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)
image = await asyncio.shield(
ffmpeg.get_image(
self._input, output_format=IMAGE_JPEG, extra_cmd=self._extra_arguments
)
return await async_get_image(
self.hass,
self._input,
output_format=IMAGE_JPEG,
extra_cmd=self._extra_arguments,
)
return image
async def handle_async_mjpeg_stream(self, request):
"""Generate an HTTP MJPEG stream from the camera."""