Skip to content

Ensure homekit camera stream can be restarted after failure#35384

Merged
bdraco merged 20 commits intohome-assistant:devfrom
bdraco:ensure_camera_available_again_if_ffmpeg_fails
May 11, 2020
Merged

Ensure homekit camera stream can be restarted after failure#35384
bdraco merged 20 commits intohome-assistant:devfrom
bdraco:ensure_camera_available_again_if_ffmpeg_fails

Conversation

@bdraco
Copy link
Copy Markdown
Member

@bdraco bdraco commented May 8, 2020

This change is much smaller than it appears as its based on #35299 which should go in before this PR

Proposed change

If ffmpeg failed to start, was killed, or the iOS device
closed the stream right away, the stream could never
be started until the HomeKit bridge was restarted.

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Example entry for configuration.yaml:

# Example configuration.yaml

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • The code has been formatted using Black (black --fast homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • Untested files have been added to .coveragerc.

The integration reached or maintains the following Integration Quality Scale:

  • No score or internal
  • 🥈 Silver
  • 🥇 Gold
  • 🏆 Platinum

@bdraco bdraco marked this pull request as draft May 8, 2020 18:05
@bdraco bdraco force-pushed the ensure_camera_available_again_if_ffmpeg_fails branch from 001fc64 to f0e2bee Compare May 8, 2020 21:33
@bdraco
Copy link
Copy Markdown
Member Author

bdraco commented May 8, 2020

Looks like there are multiple race conditions here. I think we need something to watch the pid every 10 seconds and see if it dies and then reset the camera state as this is only going to cover the case were ffmpeg dies right away.

@bdraco
Copy link
Copy Markdown
Member Author

bdraco commented May 8, 2020

probably async_track_interval and than cancel when it fails or streaming stops

@bdraco
Copy link
Copy Markdown
Member Author

bdraco commented May 9, 2020

Dead camera sessions are now getting cleaned up reliably.

@bdraco bdraco mentioned this pull request May 9, 2020
20 tasks
@bdraco bdraco marked this pull request as ready for review May 10, 2020 22:58
Comment thread homeassistant/components/homekit/type_cameras.py Outdated
@bdraco bdraco force-pushed the ensure_camera_available_again_if_ffmpeg_fails branch from 69210f0 to 2946f60 Compare May 11, 2020 05:35
@bdraco bdraco merged commit 31ee54c into home-assistant:dev May 11, 2020
@lock lock Bot locked and limited conversation to collaborators May 20, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants