Move imports in amcrest component (#27787)

This commit is contained in:
bouni 2019-10-17 15:01:09 +02:00 committed by Pascal Vizeli
parent dc72aa48da
commit 88a78a4a18

View File

@ -2,19 +2,20 @@
import asyncio import asyncio
from datetime import timedelta from datetime import timedelta
import logging import logging
from urllib3.exceptions import HTTPError
from amcrest import AmcrestError from amcrest import AmcrestError
from haffmpeg.camera import CameraMjpeg
from urllib3.exceptions import HTTPError
import voluptuous as vol import voluptuous as vol
from homeassistant.components.camera import ( from homeassistant.components.camera import (
Camera,
CAMERA_SERVICE_SCHEMA, CAMERA_SERVICE_SCHEMA,
SUPPORT_ON_OFF, SUPPORT_ON_OFF,
SUPPORT_STREAM, SUPPORT_STREAM,
Camera,
) )
from homeassistant.components.ffmpeg import DATA_FFMPEG from homeassistant.components.ffmpeg import DATA_FFMPEG
from homeassistant.const import CONF_NAME, STATE_ON, STATE_OFF from homeassistant.const import CONF_NAME, STATE_OFF, STATE_ON
from homeassistant.helpers.aiohttp_client import ( from homeassistant.helpers.aiohttp_client import (
async_aiohttp_proxy_stream, async_aiohttp_proxy_stream,
async_aiohttp_proxy_web, async_aiohttp_proxy_web,
@ -159,7 +160,6 @@ class AmcrestCam(Camera):
return await async_aiohttp_proxy_web(self.hass, request, stream_coro) return await async_aiohttp_proxy_web(self.hass, request, stream_coro)
# streaming via ffmpeg # streaming via ffmpeg
from haffmpeg.camera import CameraMjpeg
streaming_url = self._rtsp_url streaming_url = self._rtsp_url
stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop) stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop)