jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-22 12:47:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #27288 Move imports to top for FFMPEG (#27613)

Browse Source
This commit is contained in:
Steven D. Lander 2019-10-14 04:51:37 -04:00 committed by Pascal Vizeli
parent ff4e35e0ad
commit b7023a96a3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/ffmpeg/__init__.py
View File

@ -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()

4
homeassistant/components/ffmpeg/camera.py
View File

@ -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)