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.

Sign up for GitHub

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

Jump to bottom

properly update settings in rtsp devices #159

Merged
merged 49 commits into from
Aug 27, 2024
Merged

properly update settings in rtsp devices #159

merged 49 commits into from
Aug 27, 2024

Conversation

NiklasNeugebauer
Copy link
Contributor

@NiklasNeugebauer NiklasNeugebauer commented Jul 26, 2024 •
edited
Loading

Previously, upon changing framerate and jovision profiles, the camera was configured and the gstreamer pipeline was restarted.
However, the new pipeline did not actually make use of the new parameter and used the ones set during initialization of the RtspDevice instance.

This PR should fix this.

It also abstracts the settings interface away, so there will be some conflicts with #160 which should be resolved by asserting only that device is not None

  • Make sure that jovision_profile is always set before anything else

NiklasNeugebauer and others added 30 commits May 8, 2024 11:15
@NiklasNeugebauer
use new list of tuple return type of scan_for_cameras
3277d13
@NiklasNeugebauer
add motec_settings_interface
f63f0a5
@NiklasNeugebauer
add mjpeg camera tests
b98af2b
@NiklasNeugebauer
add parameters to mjpeg camera
a642594
@NiklasNeugebauer
require control_port to not be None
b09ee9c
@NiklasNeugebauer
implement async interface (with cooldowns)
d0512e2
@NiklasNeugebauer
mark tests as asyncio
d33d852
@NiklasNeugebauer
remove usage of nicegui background task
419a382 
this is necessary for usage without nicegui (for example in tests) since background_task depends on the nicegui core loop
@NiklasNeugebauer
assume that getter and setter functions can be async
7edc302 
(and make them async in mjpeg_camera)
@NiklasNeugebauer
ensure fixed event loop
0d59cb0
@NiklasNeugebauer
catch errors resulting from race conditions with a disconnect
4af8b39
@NiklasNeugebauer
add docstrings
6df6fea
@NiklasNeugebauer
remove unused import
13ba0ec
@NiklasNeugebauer
fix async errors in rtsp camera
8959571
@falkoschindler
Merge branch 'main' into motec-settings-api
8d2d5a2
@falkoschindler
code review
98ea3ff
@falkoschindler
check if result is awaitable
bb1d8ca
@falkoschindler
simplify start_capture_task
056a9fa
@falkoschindler
tiny fix
de11405
@NiklasNeugebauer
remove deprecated event_loop fixture
13c7f0a
@NiklasNeugebauer
Merge branch 'motec-settings-api' of github.com:zauberzeug/rosys into…
d0dba0a 
… motec-settings-api
@NiklasNeugebauer
fix missing value in call to setter
cf1d8f0
@NiklasNeugebauer
fix rtsp_camera test
1622112
@NiklasNeugebauer
make setter return type None or Awaitable[None]
787c583
@NiklasNeugebauer
fix missing rename to polling_interval
c6717a8
@NiklasNeugebauer
fix capture_task creation
c5694b2
@NiklasNeugebauer
give ip to camera directly
9825a61
@NiklasNeugebauer
Merge branch 'main' into motec-settings-api
2988c5f
@NiklasNeugebauer
improve RtspDevice logging
8a95a12
@NiklasNeugebauer
explicitly save if the camera should stream
48ba9ff
@NiklasNeugebauer
Copy link
Contributor Author

This should be done but I will have to test it with a real device on Monday

@NiklasNeugebauer NiklasNeugebauer mentioned this pull request Jul 26, 2024
Merged
@falkoschindler falkoschindler modified the milestones: 0.12.0, 0.13.0 Jul 29, 2024
@falkoschindler falkoschindler modified the milestones: 0.13.0, 0.14.0 Aug 5, 2024
@falkoschindler falkoschindler modified the milestones: 0.14.0, 0.15.0 Aug 15, 2024
@NiklasNeugebauer
Copy link
Contributor Author

This is ready to merge from my side

@falkoschindler falkoschindler marked this pull request as ready for review August 26, 2024 16:10
falkoschindler
falkoschindler reviewed Aug 27, 2024
View reviewed changes
Copy link
Contributor

@falkoschindler falkoschindler left a comment

Choose a reason for hiding this comment

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

I've added a few comments...

rosys/vision/rtsp_camera/rtsp_camera.py Show resolved Hide resolved
rosys/vision/rtsp_camera/rtsp_camera.py Outdated Show resolved Hide resolved
rosys/vision/rtsp_camera/rtsp_device.py Outdated Show resolved Hide resolved
NiklasNeugebauer and others added 4 commits August 27, 2024 14:13
@NiklasNeugebauer @falkoschindler
remove unnecessary type hint
776d731 
Co-authored-by: Falko Schindler <falko@zauberzeug.com>
@NiklasNeugebauer @falkoschindler
remove backslash
3ec9f84 
Co-authored-by: Falko Schindler <falko@zauberzeug.com>
@NiklasNeugebauer
remove jovision_profile field
1da3c52
@NiklasNeugebauer
calculate new url every time gstreamer is restarted
4dad17b
@NiklasNeugebauer
Copy link
Contributor Author

ready to merge from my side

@falkoschindler falkoschindler added the enhancement New feature or request label Aug 27, 2024
@falkoschindler falkoschindler merged commit 2894a97 into main Aug 27, 2024
5 checks passed
@falkoschindler falkoschindler deleted the rtsp-camera-fixes branch August 27, 2024 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@falkoschindler falkoschindler falkoschindler approved these changes

@pascalzauberzeug pascalzauberzeug Awaiting requested review from pascalzauberzeug

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
0.15.0
Development

Successfully merging this pull request may close these issues.
2 participants
@NiklasNeugebauer @falkoschindler