Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor camera stream settings #81663

Merged
merged 7 commits into from
Nov 12, 2022

Conversation

uvjustin
Copy link
Contributor

@uvjustin uvjustin commented Nov 6, 2022

Proposed change

The preload_stream (keepalive) and orientation settings are used by stream but are managed/updated by camera. This requires syncing the options from camera to stream when they are updated.
This PR puts these two options into a DynamicStreamSettings class which is passed from camera into stream, avoiding keeping two copies of the options which may get out of sync.

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)
  • Deprecation (breaking change to happen in the future)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

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.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

To help with the load of incoming pull requests:

@home-assistant
Copy link

home-assistant bot commented Nov 6, 2022

Hey there @home-assistant/core, mind taking a look at this pull request as it has been labeled with an integration (camera) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of camera can trigger bot actions by commenting:

  • @home-assistant close Closes the issue.
  • @home-assistant rename Awesome new title Change the title of the issue.
  • @home-assistant reopen Reopen the issue.
  • @home-assistant unassign camera Removes the current integration label and assignees on the issue, add the integration domain after the command.

@home-assistant
Copy link

home-assistant bot commented Nov 6, 2022

Hey there @davet2001, mind taking a look at this pull request as it has been labeled with an integration (generic) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of generic can trigger bot actions by commenting:

  • @home-assistant close Closes the issue.
  • @home-assistant rename Awesome new title Change the title of the issue.
  • @home-assistant reopen Reopen the issue.
  • @home-assistant unassign generic Removes the current integration label and assignees on the issue, add the integration domain after the command.

@home-assistant
Copy link

home-assistant bot commented Nov 6, 2022

Hey there @hunterjm, @allenporter, mind taking a look at this pull request as it has been labeled with an integration (stream) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of stream can trigger bot actions by commenting:

  • @home-assistant close Closes the issue.
  • @home-assistant rename Awesome new title Change the title of the issue.
  • @home-assistant reopen Reopen the issue.
  • @home-assistant unassign stream Removes the current integration label and assignees on the issue, add the integration domain after the command.

@uvjustin uvjustin marked this pull request as ready for review November 6, 2022 17:07
@epenet epenet mentioned this pull request Nov 8, 2022
19 tasks
@@ -498,12 +506,13 @@ def _generate_image(self, width: int | None, height: int | None) -> None:
if frames:
frame = frames[0]
if width and height:
if self._stream_settings.orientation >= 5:
if self._dynamic_stream_settings.orientation >= 5:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comparison is easier to see as an int. It happens that orientations 5, 6, 7, and 8 are rotated once so have flipped dimensions.

homeassistant/components/camera/prefs.py Outdated Show resolved Hide resolved
homeassistant/components/camera/prefs.py Outdated Show resolved Hide resolved
homeassistant/components/camera/prefs.py Show resolved Hide resolved
@uvjustin uvjustin merged commit ee910bd into home-assistant:dev Nov 12, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Nov 13, 2022
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.

generic camera does not keep stream orientation
4 participants