From b7023a96a3e5aa349e75c2790c1c14c7158f430f Mon Sep 17 00:00:00 2001 From: "Steven D. Lander" <3169732+stevendlander@users.noreply.github.com> Date: Mon, 14 Oct 2019 04:51:37 -0400 Subject: [PATCH] Issue #27288 Move imports to top for FFMPEG (#27613) --- homeassistant/components/ffmpeg/__init__.py | 2 +- homeassistant/components/ffmpeg/camera.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py index 51e1cac3859..673a34230fc 100644 --- a/homeassistant/components/ffmpeg/__init__.py +++ b/homeassistant/components/ffmpeg/__init__.py @@ -3,6 +3,7 @@ import logging import re import voluptuous as vol +from haffmpeg.tools import FFVersion from homeassistant.core import callback from homeassistant.const import ( @@ -105,7 +106,6 @@ class FFmpegManager: async def async_get_version(self): """Return ffmpeg version.""" - from haffmpeg.tools import FFVersion ffversion = FFVersion(self._bin, self.hass.loop) self._version = await ffversion.get_version() diff --git a/homeassistant/components/ffmpeg/camera.py b/homeassistant/components/ffmpeg/camera.py index 598ffe36bd4..0f500176933 100644 --- a/homeassistant/components/ffmpeg/camera.py +++ b/homeassistant/components/ffmpeg/camera.py @@ -3,6 +3,8 @@ import asyncio import logging import voluptuous as vol +from haffmpeg.camera import CameraMjpeg +from haffmpeg.tools import ImageFrame, IMAGE_JPEG from homeassistant.components.camera import PLATFORM_SCHEMA, Camera, SUPPORT_STREAM from homeassistant.const import CONF_NAME @@ -53,7 +55,6 @@ class FFmpegCamera(Camera): async def async_camera_image(self): """Return a still image response from the camera.""" - from haffmpeg.tools import ImageFrame, IMAGE_JPEG ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop) @@ -66,7 +67,6 @@ class FFmpegCamera(Camera): async def handle_async_mjpeg_stream(self, request): """Generate an HTTP MJPEG stream from the camera.""" - from haffmpeg.camera import CameraMjpeg stream = CameraMjpeg(self._manager.binary, loop=self.hass.loop) await stream.open_camera(self._input, extra_cmd=self._extra_arguments)