mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: improve filter Enum and None results

Browse source 
When we construct an Enum, check if we only added 1 value and remove the
duplicate default value we added. If we added more values, promote the
choice to an enum.
This commit is contained in:
Wim Taymans 2025-03-25 16:17:38 +01:00
parent 4ddb17c4b5
commit 437e486d6e
2 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spa/include/spa/pod/builder.h
View file

@ -156,6 +156,14 @@ SPA_API_POD_BUILDER int spa_pod_builder_raw(struct spa_pod_builder *builder, con
return res;
}
SPA_API_POD_BUILDER void spa_pod_builder_remove(struct spa_pod_builder *builder, uint32_t size)
{
struct spa_pod_frame *f;
builder->state.offset -= size;
for (f = builder->state.frame; f ; f = f->parent)
f->pod.size -= size;
}
SPA_API_POD_BUILDER int spa_pod_builder_pad(struct spa_pod_builder *builder, uint32_t size)
{
uint64_t zeroes = 0;

50
spa/include/spa/pod/filter.h
View file

@ -155,7 +155,7 @@ spa_pod_filter_prop(struct spa_pod_builder *b,
void *alt1, *alt2, *a1, *a2;
uint32_t type, size, p1c, p2c;
struct spa_pod_frame f;
int res;
int res, n_copied = 0;
v1 = spa_pod_get_values(&p1->value, &nalt1, &p1c);
alt1 = SPA_POD_BODY(v1);
@ -183,7 +183,6 @@ spa_pod_filter_prop(struct spa_pod_builder *b,
(p1c == SPA_CHOICE_None && p2c == SPA_CHOICE_Enum) ||
(p1c == SPA_CHOICE_Enum && p2c == SPA_CHOICE_None) ||
(p1c == SPA_CHOICE_Enum && p2c == SPA_CHOICE_Enum)) {
int n_copied = 0;
/* copy all equal values. Start with alt2 so that they are prefered. */
for (j = 0, a2 = alt2; j < nalt2; j++, a2 = SPA_PTROFF(a2, size, void)) {
for (k = 0, a1 = alt1; k < nalt1; k++, a1 = SPA_PTROFF(a1,size,void)) {
@ -194,16 +193,11 @@ spa_pod_filter_prop(struct spa_pod_builder *b,
}
}
}
if (n_copied == 0)
return -EINVAL;
nc->body.type = n_copied == 1 ? SPA_CHOICE_None : SPA_CHOICE_Enum;
}
if ((p1c == SPA_CHOICE_None && p2c == SPA_CHOICE_Range) ||
else if ((p1c == SPA_CHOICE_None && p2c == SPA_CHOICE_Range) ||
(p1c == SPA_CHOICE_Enum && p2c == SPA_CHOICE_Range) ||
(p1c == SPA_CHOICE_None && p2c == SPA_CHOICE_Step) ||
(p1c == SPA_CHOICE_Enum && p2c == SPA_CHOICE_Step)) {
int n_copied = 0;
void *min = SPA_PTROFF(alt2,size,void);
void *max = SPA_PTROFF(min,size,void);
void *step = p2c == SPA_CHOICE_Step ? SPA_PTROFF(max,size,void) : NULL;
@ -230,16 +224,11 @@ spa_pod_filter_prop(struct spa_pod_builder *b,
spa_pod_builder_raw(b, a1, size);
spa_pod_builder_raw(b, a1, size);
}
if (n_copied == 0)
return -EINVAL;
nc->body.type = n_copied == 1 ? SPA_CHOICE_None : SPA_CHOICE_Enum;
}
if ((p1c == SPA_CHOICE_Range && p2c == SPA_CHOICE_None) ||
else if ((p1c == SPA_CHOICE_Range && p2c == SPA_CHOICE_None) ||
(p1c == SPA_CHOICE_Range && p2c == SPA_CHOICE_Enum) ||
(p1c == SPA_CHOICE_Step && p2c == SPA_CHOICE_None) ||
(p1c == SPA_CHOICE_Step && p2c == SPA_CHOICE_Enum)) {
int n_copied = 0;
void *min = SPA_PTROFF(alt1,size,void);
void *max = SPA_PTROFF(min,size,void);
void *step = p1c == SPA_CHOICE_Step ? SPA_PTROFF(max,size,void) : NULL;
@ -255,12 +244,8 @@ spa_pod_filter_prop(struct spa_pod_builder *b,
spa_pod_builder_raw(b, a2, size);
spa_pod_builder_raw(b, a2, size);
}
if (n_copied == 0)
return -EINVAL;
nc->body.type = n_copied == 1 ? SPA_CHOICE_None : SPA_CHOICE_Enum;
}
if ((p1c == SPA_CHOICE_Range && p2c == SPA_CHOICE_Range) ||
else if ((p1c == SPA_CHOICE_Range && p2c == SPA_CHOICE_Range) ||
(p1c == SPA_CHOICE_Range && p2c == SPA_CHOICE_Step) ||
(p1c == SPA_CHOICE_Step && p2c == SPA_CHOICE_Range) ||
(p1c == SPA_CHOICE_Step && p2c == SPA_CHOICE_Step)) {
@ -299,28 +284,37 @@ spa_pod_filter_prop(struct spa_pod_builder *b,
spa_pod_builder_raw(b, max1, size);
nc->body.type = SPA_CHOICE_Range;
}
if ((p1c == SPA_CHOICE_None && p2c == SPA_CHOICE_Flags) ||
else if ((p1c == SPA_CHOICE_None && p2c == SPA_CHOICE_Flags) ||
(p1c == SPA_CHOICE_Flags && p2c == SPA_CHOICE_None) ||
(p1c == SPA_CHOICE_Flags && p2c == SPA_CHOICE_Flags)) {
if (spa_pod_filter_flags_value(b, type, alt1, alt2, size) != 1)
return -EINVAL;
nc->body.type = SPA_CHOICE_Flags;
}
if (p1c == SPA_CHOICE_Range && p2c == SPA_CHOICE_Flags)
else if (p1c == SPA_CHOICE_Range && p2c == SPA_CHOICE_Flags)
return -ENOTSUP;
if (p1c == SPA_CHOICE_Enum && p2c == SPA_CHOICE_Flags)
else if (p1c == SPA_CHOICE_Enum && p2c == SPA_CHOICE_Flags)
return -ENOTSUP;
if (p1c == SPA_CHOICE_Step && p2c == SPA_CHOICE_Flags)
else if (p1c == SPA_CHOICE_Step && p2c == SPA_CHOICE_Flags)
return -ENOTSUP;
if (p1c == SPA_CHOICE_Flags && p2c == SPA_CHOICE_Range)
else if (p1c == SPA_CHOICE_Flags && p2c == SPA_CHOICE_Range)
return -ENOTSUP;
if (p1c == SPA_CHOICE_Flags && p2c == SPA_CHOICE_Step)
else if (p1c == SPA_CHOICE_Flags && p2c == SPA_CHOICE_Step)
return -ENOTSUP;
if (p1c == SPA_CHOICE_Flags && p2c == SPA_CHOICE_Enum)
else if (p1c == SPA_CHOICE_Flags && p2c == SPA_CHOICE_Enum)
return -ENOTSUP;
if (nc->body.type == SPA_CHOICE_None) {
if (n_copied == 0) {
return -EINVAL;
} else if (n_copied == 1) {
/* we always copy the default value twice, so remove it
* again when it was the only one added */
spa_pod_builder_remove(b, size);
} else if (n_copied > 1) {
nc->body.type = SPA_CHOICE_Enum;
}
}
spa_pod_builder_pop(b, &f);
return 0;