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

pod: move some filter functions to compare

Browse source
This commit is contained in:
Wim Taymans 2025-04-23 11:16:54 +02:00
parent 1cca24c585
commit 19f6d83fa2
2 changed files with 84 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

80
spa/include/spa/pod/compare.h
View file

@ -163,6 +163,86 @@ SPA_API_POD_COMPARE int spa_pod_compare(const struct spa_pod *pod1,
return res;
}
SPA_API_POD_COMPARE int spa_pod_compare_is_compatible_flags(uint32_t type, const void *r1,
const void *r2, uint32_t size SPA_UNUSED)
{
switch (type) {
case SPA_TYPE_Int:
return ((*(int32_t *) r1) & (*(int32_t *) r2)) != 0;
case SPA_TYPE_Long:
return ((*(int64_t *) r1) & (*(int64_t *) r2)) != 0;
default:
return -ENOTSUP;
}
return 0;
}
SPA_API_POD_COMPARE int spa_pod_compare_is_step_of(uint32_t type, const void *r1,
const void *r2, uint32_t size SPA_UNUSED)
{
switch (type) {
case SPA_TYPE_Int:
return *(int32_t *) r1 % *(int32_t *) r2 == 0;
case SPA_TYPE_Long:
return *(int64_t *) r1 % *(int64_t *) r2 == 0;
case SPA_TYPE_Rectangle:
{
const struct spa_rectangle *rec1 = (struct spa_rectangle *) r1,
*rec2 = (struct spa_rectangle *) r2;
return (rec1->width % rec2->width == 0 &&
rec1->height % rec2->height == 0);
}
default:
return -ENOTSUP;
}
return 0;
}
SPA_API_POD_COMPARE int spa_pod_compare_is_in_range(uint32_t type, const void *v,
const void *min, const void *max, const void *step, uint32_t size SPA_UNUSED)
{
if (spa_pod_compare_value(type, v, min, size) < 0 ||
spa_pod_compare_value(type, v, max, size) > 0)
return 0;
if (step != NULL)
return spa_pod_compare_is_step_of(type, v, step, size);
return 1;
}
SPA_API_POD_COMPARE int spa_pod_compare_is_valid_choice(uint32_t type, uint32_t size,
const void *val, const void *vals, uint32_t n_vals, uint32_t choice)
{
switch (choice) {
case SPA_CHOICE_None:
if (spa_pod_compare_value(type, val, vals, size) == 0)
return 1;
return 0;
case SPA_CHOICE_Enum:
{
const void *next = vals;
for (uint32_t i = 1; i < n_vals; i++) {
next = SPA_PTROFF(next, size, void);
if (spa_pod_compare_value(type, val, next, size) == 0)
return 1;
}
return 0;
}
case SPA_CHOICE_Range:
case SPA_CHOICE_Step:
{
void *min = SPA_PTROFF(vals,size,void);
void *max = SPA_PTROFF(min,size,void);
void *step = choice == SPA_CHOICE_Step ? SPA_PTROFF(max,size,void) : NULL;
return spa_pod_compare_is_in_range(type, val, min, max, step, size);
}
case SPA_CHOICE_Flags:
return 1;
}
return 0;
}
/**
* \}
*/

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

@ -112,39 +112,6 @@ SPA_API_POD_FILTER int spa_pod_filter_flags_value(struct spa_pod_builder *b,
return 1;
}
SPA_API_POD_FILTER int spa_pod_filter_is_step_of(uint32_t type, const void *r1,
const void *r2, uint32_t size SPA_UNUSED)
{
switch (type) {
case SPA_TYPE_Int:
return *(int32_t *) r1 % *(int32_t *) r2 == 0;
case SPA_TYPE_Long:
return *(int64_t *) r1 % *(int64_t *) r2 == 0;
case SPA_TYPE_Rectangle:
{
const struct spa_rectangle *rec1 = (struct spa_rectangle *) r1,
*rec2 = (struct spa_rectangle *) r2;
return (rec1->width % rec2->width == 0 &&
rec1->height % rec2->height == 0);
}
default:
return -ENOTSUP;
}
return 0;
}
SPA_API_POD_FILTER int spa_pod_filter_is_in_range(uint32_t type, const void *v,
const void *min, const void *max, const void *step, uint32_t size SPA_UNUSED)
{
if (spa_pod_compare_value(type, v, min, size) < 0 ||
spa_pod_compare_value(type, v, max, size) > 0)
return 0;
if (step != NULL)
return spa_pod_filter_is_step_of(type, v, step, size);
return 1;
}
SPA_API_POD_FILTER int
spa_pod_filter_prop(struct spa_pod_builder *b,
const struct spa_pod_prop *p1,
@ -222,7 +189,7 @@ spa_pod_filter_prop(struct spa_pod_builder *b,
}
/* copy all values inside the range */
for (j = 0, a1 = alt1; j < nalt1; j++, a1 = SPA_PTROFF(a1,size,void)) {
if ((res = spa_pod_filter_is_in_range(type, a1, min, max, step, size)) < 0)
if ((res = spa_pod_compare_is_in_range(type, a1, min, max, step, size)) < 0)
return res;
if (res == 0)
continue;
@ -242,7 +209,7 @@ spa_pod_filter_prop(struct spa_pod_builder *b,
/* copy all values inside the range, this will automatically prefer
* a valid alt2 value */
for (j = 0, a2 = alt2; j < nalt2; j++, a2 = SPA_PTROFF(a2,size,void)) {
if ((res = spa_pod_filter_is_in_range(type, a2, min, max, step, size)) < 0)
if ((res = spa_pod_compare_is_in_range(type, a2, min, max, step, size)) < 0)
return res;
if (res == 0)
continue;
@ -273,12 +240,12 @@ spa_pod_filter_prop(struct spa_pod_builder *b,
/* prefer alt2 if in new range */
a1 = alt2;
if ((res = spa_pod_filter_is_in_range(type, a1, min1, max1, NULL, size)) < 0)
if ((res = spa_pod_compare_is_in_range(type, a1, min1, max1, NULL, size)) < 0)
return res;
if (res == 0) {
/* try alt1 otherwise */
a1 = alt1;
if ((res = spa_pod_filter_is_in_range(type, a1, min1, max1, NULL, size)) < 0)
if ((res = spa_pod_compare_is_in_range(type, a1, min1, max1, NULL, size)) < 0)
return res;
/* fall back to new min value then */
if (res == 0)