mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-07 13:30:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: ensure enum always has 2 values

Browse source 
We need at least a default value and the default value as a possible
value.

For enum type in the PropInfo we usually list just the basic type and
then use labels to list alternatives.
This commit is contained in:
Wim Taymans 2025-11-04 09:19:26 +01:00
parent ef7d4a3fc3
commit 41cdd82291
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/include/spa/pod/vararg.h
View file

@ -28,7 +28,7 @@ extern "C" {
#define SPA_CHOICE_RANGE(def,min,max) 3,(def),(min),(max) #define SPA_CHOICE_RANGE(def,min,max) 3,(def),(min),(max)
#define SPA_CHOICE_STEP(def,min,max,step) 4,(def),(min),(max),(step) #define SPA_CHOICE_STEP(def,min,max,step) 4,(def),(min),(max),(step)
#define SPA_CHOICE_ENUM(n_vals,...) (n_vals),##__VA_ARGS__ #define SPA_CHOICE_ENUM(n_vals,def,alt1,...) (n_vals),(def),(alt1),##__VA_ARGS__
#define SPA_CHOICE_FLAGS(flags) 1, (flags) #define SPA_CHOICE_FLAGS(flags) 1, (flags)
#define SPA_CHOICE_FEATURES(features) 1, (features) #define SPA_CHOICE_FEATURES(features) 1, (features)
#define SPA_CHOICE_BOOL(def) 3,(def),(def),!(def) #define SPA_CHOICE_BOOL(def) 3,(def),(def),!(def)

2
spa/plugins/v4l2/v4l2-utils.c
View file

@ -1486,7 +1486,7 @@ spa_v4l2_enum_controls(struct impl *this, int seq,
spa_pod_builder_push_object(&b.b, &f[0], SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo); spa_pod_builder_push_object(&b.b, &f[0], SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo);
spa_pod_builder_add(&b.b, spa_pod_builder_add(&b.b,
SPA_PROP_INFO_id, SPA_POD_Id(prop_id), SPA_PROP_INFO_id, SPA_POD_Id(prop_id),
SPA_PROP_INFO_type, SPA_POD_CHOICE_ENUM_Int(1, (int32_t)queryctrl.default_value), SPA_PROP_INFO_type, SPA_POD_Int((int32_t)queryctrl.default_value),
SPA_PROP_INFO_description, SPA_POD_String(queryctrl.name), SPA_PROP_INFO_description, SPA_POD_String(queryctrl.name),
0); 0);

4
test/test-spa-pod.c
View file

@ -1612,7 +1612,7 @@ PWTEST(pod_overflow)
spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo); spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo);
spa_pod_builder_add(&b, spa_pod_builder_add(&b,
SPA_PROP_INFO_id, SPA_POD_Id(32567359), SPA_PROP_INFO_id, SPA_POD_Id(32567359),
SPA_PROP_INFO_type, SPA_POD_CHOICE_ENUM_Int(1, 0), SPA_PROP_INFO_type, SPA_POD_Int(0),
SPA_PROP_INFO_description, SPA_POD_String("DV Timings"), SPA_PROP_INFO_description, SPA_POD_String("DV Timings"),
0); 0);
@ -1669,7 +1669,7 @@ PWTEST(pod_overflow2)
spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo); spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_PropInfo, SPA_PARAM_PropInfo);
spa_pod_builder_add(&b, spa_pod_builder_add(&b,
SPA_PROP_INFO_id, SPA_POD_Id(32567359), SPA_PROP_INFO_id, SPA_POD_Id(32567359),
SPA_PROP_INFO_type, SPA_POD_CHOICE_ENUM_Int(1, 0), SPA_PROP_INFO_type, SPA_POD_Int(0),
SPA_PROP_INFO_description, SPA_POD_String("DV Timings"), SPA_PROP_INFO_description, SPA_POD_String("DV Timings"),
0); 0);