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

Update ha-ffmpeg 2.0 (#22427)

Browse source
This commit is contained in:
Pascal Vizeli 2019-03-27 07:55:05 +01:00 • committed by Sebastian Muszynski
parent 19d99ddf57
commit a55afa8119
14 changed files with 41 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
homeassistant/components/canary/camera.py
View file

@ -80,7 +80,7 @@ class CanaryCamera(Camera):
"""Return a still image response from the camera."""
self.renew_live_stream_session()
from haffmpeg import ImageFrame, IMAGE_JPEG
from haffmpeg.tools import ImageFrame, IMAGE_JPEG
ffmpeg = ImageFrame(self._ffmpeg.binary, loop=self.hass.loop)
image = await asyncio.shield(ffmpeg.get_image(
self._live_stream_session.live_stream_url,
@ -93,15 +93,16 @@ class CanaryCamera(Camera):
if self._live_stream_session is None:
return
from haffmpeg import CameraMjpeg
from haffmpeg.camera import CameraMjpeg
stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop)
await stream.open_camera(
self._live_stream_session.live_stream_url,
extra_cmd=self._ffmpeg_arguments)
try:
stream_reader = await stream.get_reader()
return await async_aiohttp_proxy_stream(
self.hass, request, stream,
self.hass, request, stream_reader,
self._ffmpeg.ffmpeg_stream_content_type)
finally:
await stream.close()