linux-pipewire: camera-portal: Support enumerated sizes #12509
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pobrn
commented
Aug 15, 2025
pobrn
force-pushed
the
pw_cam_size_choice
branch
2 times, most recently
from
2111490 to
aca61e3
Compare
|
Why is this PR opened as a Draft PR? In general we want to keep the amount of Draft PRs to a minimum (ideally zero) as those clutter the already-growing list of open PRs. If this PR is ready for production, it should also be ready for review. If it is not ready for review, it should not have been opened. |
pobrn
force-pushed
the
pw_cam_size_choice
branch
from
aca61e3 to
b830979
Compare
|
Oh, okay. |
Add a new function `get_values_from_pod()` to provide a wrapper around `spa_pod_get_values()` with extra checks, and that ignores the default value for `SPA_CHOICE_Enum`.
The refactor in obsproject#11741 made it so that if an offered format of a node does not have a frame rate, then that is ignored. Instead of ignoring those formats, just skip those parts from the format description.
pobrn
force-pushed
the
pw_cam_size_choice
branch
from
b830979 to
7db3dab
Compare
A node might choose to use an enumerated choice pod to report the set of
supported sizes. Currently that is not supported. And what's worse, since
`SPA_POD_OPT_Rectangle()` is used, if the node uses an enum choice, then
`{,this_}resolution` stays uninitialized but `spa_pod_parse_object()` will
not report errors because the field is considered optional.
Fix this by handling `SPA_CHOICE_Enum` as well, and ignoring the unsupported
choice types.
pobrn
force-pushed
the
pw_cam_size_choice
branch
from
7db3dab to
c6c927e
Compare
|
Rebased after #11741. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description + Motivation and Context
A node might choose to use an enumerated choice pod to report the set of
supported sizes. Currently that is not supported. And what's worse, since
SPA_POD_OPT_Rectangle()is used, if the node uses an enum choice, then{,this_}resolutionstays uninitialized butspa_pod_parse_object()willnot report errors because the field is considered optional.
Fix this by using
spa_pod_get_values(), which can be used for concretevalues, and both
SPA_CHOICE_{None,Enum}.Since the resolutions are parsed in two separate places, and since the
frame rates require essentially the same treatment a new function is
introduced to handle the common parts.
How Has This Been Tested?
With the current pipewire master branch, with a video node that uses enumerated choice for size, as well as nodes that don't use enumerated choices.
Types of changes
Checklist: