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

FFmpeg 1.8 (#9944)

Browse source 
* Update requirements_all.txt

* Update requirements_test_all.txt

* Update ffmpeg.py

* Update ffmpeg.py

* Update yi.py

* Update onvif.py

* Update yi.py
This commit is contained in:
Pascal Vizeli 2017-10-18 17:11:22 +02:00 • committed by GitHub
parent 628b9bd8d8
commit 8a93cc147a
6 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,9 +55,9 @@ class FFmpegCamera(Camera):
from haffmpeg import ImageFrame, IMAGE_JPEG from haffmpeg import ImageFrame, IMAGE_JPEG
ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop) ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)
image = yield from ffmpeg.get_image( image = yield from asyncio.shield(ffmpeg.get_image(
self._input, output_format=IMAGE_JPEG, self._input, output_format=IMAGE_JPEG,
extra_cmd=self._extra_arguments) extra_cmd=self._extra_arguments), loop=self.hass.loop)
return image return image
@asyncio.coroutine @asyncio.coroutine

4
homeassistant/components/camera/onvif.py
View file

@ -78,9 +78,9 @@ class ONVIFCamera(Camera):
ffmpeg = ImageFrame( ffmpeg = ImageFrame(
self.hass.data[DATA_FFMPEG].binary, loop=self.hass.loop) self.hass.data[DATA_FFMPEG].binary, loop=self.hass.loop)
image = yield from ffmpeg.get_image( image = yield from asyncio.shield(ffmpeg.get_image(
self._input, output_format=IMAGE_JPEG, self._input, output_format=IMAGE_JPEG,
extra_cmd=self._ffmpeg_arguments) extra_cmd=self._ffmpeg_arguments), loop=self.hass.loop)
return image return image
@asyncio.coroutine @asyncio.coroutine

5
homeassistant/components/camera/yi.py
View file

@ -115,8 +115,9 @@ class YiCamera(Camera):
url = yield from self.hass.async_add_job(self.get_latest_video_url) url = yield from self.hass.async_add_job(self.get_latest_video_url)
if url != self._last_url: if url != self._last_url:
ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop) ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)
self._last_image = yield from ffmpeg.get_image( self._last_image = yield from asyncio.shield(ffmpeg.get_image(
url, output_format=IMAGE_JPEG, extra_cmd=self._extra_arguments) url, output_format=IMAGE_JPEG,
extra_cmd=self._extra_arguments), loop=self.hass.loop)
self._last_url = url self._last_url = url
return self._last_image return self._last_image

2
homeassistant/components/ffmpeg.py
View file

@ -19,7 +19,7 @@ from homeassistant.helpers.dispatcher import (
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
REQUIREMENTS = ['ha-ffmpeg==1.7'] REQUIREMENTS = ['ha-ffmpeg==1.8']
DOMAIN = 'ffmpeg' DOMAIN = 'ffmpeg'

2
requirements_all.txt
View file

@ -291,7 +291,7 @@ gps3==0.33.3
gstreamer-player==1.1.0 gstreamer-player==1.1.0
# homeassistant.components.ffmpeg # homeassistant.components.ffmpeg
ha-ffmpeg==1.7 ha-ffmpeg==1.8
# homeassistant.components.media_player.philips_js # homeassistant.components.media_player.philips_js
ha-philipsjs==0.0.1 ha-philipsjs==0.0.1

2
requirements_test_all.txt
View file

@ -59,7 +59,7 @@ fuzzywuzzy==0.15.1
gTTS-token==1.1.1 gTTS-token==1.1.1
# homeassistant.components.ffmpeg # homeassistant.components.ffmpeg
ha-ffmpeg==1.7 ha-ffmpeg==1.8
# homeassistant.components.sensor.geo_rss_events # homeassistant.components.sensor.geo_rss_events
haversine==0.4.5 haversine==0.4.5