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

pod: disable padding when in body

Browse source 
Disable the padding to pod alignment for everything when we are building
the body of an array or choice.

This makes it possible to use bytes or strings or any other pod of a
fixed size as entries in arrays or choice.
This commit is contained in:
Wim Taymans 2025-07-22 13:58:11 +02:00
parent b904cb14a9
commit e91c541446
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -183,6 +183,8 @@ SPA_API_POD_BUILDER void spa_pod_builder_remove(struct spa_pod_builder *builder,
SPA_API_POD_BUILDER int spa_pod_builder_pad(struct spa_pod_builder *builder, uint32_t size) SPA_API_POD_BUILDER int spa_pod_builder_pad(struct spa_pod_builder *builder, uint32_t size)
{ {
uint64_t zeroes = 0; uint64_t zeroes = 0;
if (builder->state.flags == SPA_POD_BUILDER_FLAG_BODY)
return 0;
size = SPA_ROUND_UP_N(size, SPA_POD_ALIGN) - size; size = SPA_ROUND_UP_N(size, SPA_POD_ALIGN) - size;
return size ? spa_pod_builder_raw(builder, &zeroes, size) : 0; return size ? spa_pod_builder_raw(builder, &zeroes, size) : 0;
} }
@ -218,7 +220,6 @@ spa_pod_builder_primitive(struct spa_pod_builder *builder, const struct spa_pod
{ {
const void *data; const void *data;
uint32_t size; uint32_t size;
int r, res;
if (builder->state.flags == SPA_POD_BUILDER_FLAG_BODY) { if (builder->state.flags == SPA_POD_BUILDER_FLAG_BODY) {
data = SPA_POD_BODY_CONST(p); data = SPA_POD_BODY_CONST(p);
@ -228,11 +229,7 @@ spa_pod_builder_primitive(struct spa_pod_builder *builder, const struct spa_pod
size = SPA_POD_SIZE(p); size = SPA_POD_SIZE(p);
SPA_FLAG_CLEAR(builder->state.flags, SPA_POD_BUILDER_FLAG_FIRST); SPA_FLAG_CLEAR(builder->state.flags, SPA_POD_BUILDER_FLAG_FIRST);
} }
res = spa_pod_builder_raw(builder, data, size); return spa_pod_builder_raw_padded(builder, data, size);
if (builder->state.flags != SPA_POD_BUILDER_FLAG_BODY)
if ((r = spa_pod_builder_pad(builder, size)) < 0)
res = r;
return res;
} }
#define SPA_POD_INIT(size,type) ((struct spa_pod) { (size), (type) }) #define SPA_POD_INIT(size,type) ((struct spa_pod) { (size), (type) })