Home-Assistant/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-12-24 12:59:34 +00:00
Code Activity

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

5
homeassistant/components/amcrest/camera.py
View File

@@ -78,7 +78,7 @@ class AmcrestCam(Camera):
self.hass, request, stream_coro)
# streaming via ffmpeg
from haffmpeg import CameraMjpeg
from haffmpeg.camera import CameraMjpeg
streaming_url = self._camera.rtsp_url(typeno=self._resolution)
stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop)
@@ -86,8 +86,9 @@ class AmcrestCam(Camera):
streaming_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()