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

Bump ha-ffmpeg to 3.0.2 (#43597)

Browse source
This commit is contained in:
Paulus Schoutsen 2020-11-25 08:45:15 +01:00 • committed by GitHub
parent c421555db3
commit 0cf3736162
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/amcrest/camera.py
View file

@ -236,7 +236,7 @@ class AmcrestCam(Camera):
# streaming via ffmpeg
streaming_url = self._rtsp_url
stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop)
stream = CameraMjpeg(self._ffmpeg.binary)
await stream.open_camera(streaming_url, extra_cmd=self._ffmpeg_arguments)
try:

2
homeassistant/components/arlo/camera.py
View file

@ -88,7 +88,7 @@ class ArloCam(Camera):
_LOGGER.error(error_msg)
return
stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop)
stream = CameraMjpeg(self._ffmpeg.binary)
await stream.open_camera(video.video_url, extra_cmd=self._ffmpeg_arguments)
try:

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

@ -128,7 +128,7 @@ class CanaryCamera(CoordinatorEntity, Camera):
"""Return a still image response from the camera."""
await self.hass.async_add_executor_job(self.renew_live_stream_session)
ffmpeg = ImageFrame(self._ffmpeg.binary, loop=self.hass.loop)
ffmpeg = ImageFrame(self._ffmpeg.binary)
image = await asyncio.shield(
ffmpeg.get_image(
self._live_stream_session.live_stream_url,
@ -143,7 +143,7 @@ class CanaryCamera(CoordinatorEntity, Camera):
if self._live_stream_session is None:
return
stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop)
stream = CameraMjpeg(self._ffmpeg.binary)
await stream.open_camera(
self._live_stream_session.live_stream_url, extra_cmd=self._ffmpeg_arguments
)

2
homeassistant/components/ezviz/camera.py
View file

@ -217,7 +217,7 @@ class HassEzvizCamera(Camera):
async def async_camera_image(self):
"""Return a frame from the camera stream."""
ffmpeg = ImageFrame(self._ffmpeg.binary, loop=self.hass.loop)
ffmpeg = ImageFrame(self._ffmpeg.binary)
image = await asyncio.shield(
ffmpeg.get_image(self._rtsp_stream, output_format=IMAGE_JPEG)

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

@ -97,7 +97,7 @@ async def async_get_image(
):
"""Get an image from a frame of an RTSP stream."""
manager = hass.data[DATA_FFMPEG]
ffmpeg = ImageFrame(manager.binary, loop=hass.loop)
ffmpeg = ImageFrame(manager.binary)
image = await asyncio.shield(
ffmpeg.get_image(input_source, output_format=output_format, extra_cmd=extra_cmd)
)
@ -123,7 +123,7 @@ class FFmpegManager:
async def async_get_version(self):
"""Return ffmpeg version."""
ffversion = FFVersion(self._bin, self.hass.loop)
ffversion = FFVersion(self._bin)
self._version = await ffversion.get_version()
self._major_version = None

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

@ -61,7 +61,7 @@ class FFmpegCamera(Camera):
async def handle_async_mjpeg_stream(self, request):
"""Generate an HTTP MJPEG stream from the camera."""
stream = CameraMjpeg(self._manager.binary, loop=self.hass.loop)
stream = CameraMjpeg(self._manager.binary)
await stream.open_camera(self._input, extra_cmd=self._extra_arguments)
try:

2
homeassistant/components/ffmpeg/manifest.json
View file

@ -2,6 +2,6 @@
"domain": "ffmpeg",
"name": "FFmpeg",
"documentation": "https://www.home-assistant.io/integrations/ffmpeg",
"requirements": ["ha-ffmpeg==2.0"],
"requirements": ["ha-ffmpeg==3.0.2"],
"codeowners": []
}

4
homeassistant/components/ffmpeg_motion/binary_sensor.py
View file

@ -90,9 +90,7 @@ class FFmpegMotion(FFmpegBinarySensor):
"""Initialize FFmpeg motion binary sensor."""
super().__init__(config)
self.ffmpeg = ffmpeg_sensor.SensorMotion(
manager.binary, hass.loop, self._async_callback
)
self.ffmpeg = ffmpeg_sensor.SensorMotion(manager.binary, self._async_callback)
async def _async_start_ffmpeg(self, entity_ids):
"""Start a FFmpeg instance.

4
homeassistant/components/ffmpeg_noise/binary_sensor.py
View file

@ -53,9 +53,7 @@ class FFmpegNoise(FFmpegBinarySensor):
"""Initialize FFmpeg noise binary sensor."""
super().__init__(config)
self.ffmpeg = ffmpeg_sensor.SensorNoise(
manager.binary, hass.loop, self._async_callback
)
self.ffmpeg = ffmpeg_sensor.SensorNoise(manager.binary, self._async_callback)
async def _async_start_ffmpeg(self, entity_ids):
"""Start a FFmpeg instance.

2
homeassistant/components/homekit/type_cameras.py
View file

@ -370,7 +370,7 @@ class Camera(HomeAccessory, PyhapCamera):
if self.config[CONF_SUPPORT_AUDIO]:
output = output + " " + AUDIO_OUTPUT.format(**output_vars)
_LOGGER.debug("FFmpeg output settings: %s", output)
stream = HAFFmpeg(self._ffmpeg.binary, loop=self.driver.loop)
stream = HAFFmpeg(self._ffmpeg.binary)
opened = await stream.open(
cmd=[], input_source=input_source, output=output, stdout_pipe=False
)

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

@ -136,7 +136,7 @@ class ONVIFCameraEntity(ONVIFBaseEntity, Camera):
)
if image is None:
ffmpeg = ImageFrame(self.hass.data[DATA_FFMPEG].binary, loop=self.hass.loop)
ffmpeg = ImageFrame(self.hass.data[DATA_FFMPEG].binary)
image = await asyncio.shield(
ffmpeg.get_image(
self._stream_uri,
@ -154,7 +154,7 @@ class ONVIFCameraEntity(ONVIFBaseEntity, Camera):
LOGGER.debug("Handling mjpeg stream from camera '%s'", self.device.name)
ffmpeg_manager = self.hass.data[DATA_FFMPEG]
stream = CameraMjpeg(ffmpeg_manager.binary, loop=self.hass.loop)
stream = CameraMjpeg(ffmpeg_manager.binary)
await stream.open_camera(
self._stream_uri,

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

@ -103,7 +103,7 @@ class RingCam(RingEntityMixin, Camera):
async def async_camera_image(self):
"""Return a still image response from the camera."""
ffmpeg = ImageFrame(self._ffmpeg.binary, loop=self.hass.loop)
ffmpeg = ImageFrame(self._ffmpeg.binary)
if self._video_url is None:
return
@ -121,7 +121,7 @@ class RingCam(RingEntityMixin, Camera):
if self._video_url is None:
return
stream = CameraMjpeg(self._ffmpeg.binary, loop=self.hass.loop)
stream = CameraMjpeg(self._ffmpeg.binary)
await stream.open_camera(self._video_url)
try:

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

@ -149,7 +149,7 @@ class XiaomiCamera(Camera):
url = await self.hass.async_add_executor_job(self.get_latest_video_url, host)
if url != self._last_url:
ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)
ffmpeg = ImageFrame(self._manager.binary)
self._last_image = await asyncio.shield(
ffmpeg.get_image(
url, output_format=IMAGE_JPEG, extra_cmd=self._extra_arguments
@ -162,7 +162,7 @@ class XiaomiCamera(Camera):
async def handle_async_mjpeg_stream(self, request):
"""Generate an HTTP MJPEG stream from the camera."""
stream = CameraMjpeg(self._manager.binary, loop=self.hass.loop)
stream = CameraMjpeg(self._manager.binary)
await stream.open_camera(self._last_url, extra_cmd=self._extra_arguments)
try:

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

@ -123,12 +123,11 @@ class YiCamera(Camera):
"""Return a still image response from the camera."""
url = await self._get_latest_video_url()
if url and url != self._last_url:
ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)
ffmpeg = ImageFrame(self._manager.binary)
self._last_image = await asyncio.shield(
ffmpeg.get_image(
url, output_format=IMAGE_JPEG, extra_cmd=self._extra_arguments
),
loop=self.hass.loop,
)
self._last_url = url
@ -139,7 +138,7 @@ class YiCamera(Camera):
if not self._is_on:
return
stream = CameraMjpeg(self._manager.binary, loop=self.hass.loop)
stream = CameraMjpeg(self._manager.binary)
await stream.open_camera(self._last_url, extra_cmd=self._extra_arguments)
try:

2
requirements_all.txt
View file

@ -720,7 +720,7 @@ gstreamer-player==1.1.2
guppy3==3.1.0
# homeassistant.components.ffmpeg
ha-ffmpeg==2.0
ha-ffmpeg==3.0.2
# homeassistant.components.philips_js
ha-philipsjs==0.0.8

2
requirements_test_all.txt
View file

@ -367,7 +367,7 @@ griddypower==0.1.0
guppy3==3.1.0
# homeassistant.components.ffmpeg
ha-ffmpeg==2.0
ha-ffmpeg==3.0.2
# homeassistant.components.hangouts
hangups==0.4.11

4
tests/components/ffmpeg/test_sensor.py
View file

@ -61,7 +61,7 @@ class TestFFmpegNoiseSetup:
entity = self.hass.states.get("binary_sensor.ffmpeg_noise")
assert entity.state == "off"
self.hass.add_job(mock_ffmpeg.call_args[0][2], True)
self.hass.add_job(mock_ffmpeg.call_args[0][1], True)
self.hass.block_till_done()
entity = self.hass.states.get("binary_sensor.ffmpeg_noise")
@ -123,7 +123,7 @@ class TestFFmpegMotionSetup:
entity = self.hass.states.get("binary_sensor.ffmpeg_motion")
assert entity.state == "off"
self.hass.add_job(mock_ffmpeg.call_args[0][2], True)
self.hass.add_job(mock_ffmpeg.call_args[0][1], True)
self.hass.block_till_done()
entity = self.hass.states.get("binary_sensor.ffmpeg_motion")