Update ha-ffmpeg 2.0 (#22427)

This commit is contained in:
Pascal Vizeli authored and Sebastian Muszynski committed 2019-03-27 07:55:05 +01:00
1 parent 19d99ddf57
commit a55afa8119
14 files changed
+41 -31

No files matched your search

+4 -3
View File
@@ -190,7 +190,7 @@ class ONVIFHassCamera(Camera):
async def async_camera_image(self):
"""Return a still image response from the camera."""
from haffmpeg import ImageFrame, IMAGE_JPEG
from haffmpeg.tools import ImageFrame, IMAGE_JPEG
if not self._input:
await self.hass.async_add_job(self.obtain_input_uri)
@@ -207,7 +207,7 @@ class ONVIFHassCamera(Camera):
async def handle_async_mjpeg_stream(self, request):
"""Generate an HTTP MJPEG stream from the camera."""
from haffmpeg import CameraMjpeg
from haffmpeg.camera import CameraMjpeg
if not self._input:
await self.hass.async_add_job(self.obtain_input_uri)
@@ -221,8 +221,9 @@ class ONVIFHassCamera(Camera):
self._input, 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,
ffmpeg_manager.ffmpeg_stream_content_type)
finally:
await stream.close()