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

Move imports in canary component (#27874)

Browse source
This commit is contained in:
bouni 2019-10-19 01:01:59 +02:00 • committed by cgtobi
parent dc5d38128c
commit d78f14b20a
3 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,8 @@ import asyncio
from datetime import timedelta
import logging
from haffmpeg.camera import CameraMjpeg
from haffmpeg.tools import IMAGE_JPEG, ImageFrame
import voluptuous as vol
from homeassistant.components.camera import PLATFORM_SCHEMA, Camera
@ -81,8 +83,6 @@ class CanaryCamera(Camera):
"""Return a still image response from the camera."""
self.renew_live_stream_session()
from haffmpeg.tools import ImageFrame, IMAGE_JPEG
ffmpeg = ImageFrame(self._ffmpeg.binary, loop=self.hass.loop)
image = await asyncio.shield(
ffmpeg.get_image(
@ -98,8 +98,6 @@ class CanaryCamera(Camera):
if self._live_stream_session is None:
return
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