mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

buffers: small cleanup of the buffer allocation

Browse source 
Calculate the min_buffers separately and then use that to ensure we have
enough buffers. This makes it easier to increase the min amount later.
This commit is contained in:
Wim Taymans 2025-09-19 09:17:47 +02:00
parent 1717ff336e
commit 83242a5c3c
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/pipewire/buffers.c
View file

@ -188,7 +188,7 @@ int pw_buffers_negotiate(struct pw_context *context, uint32_t flags,
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
uint32_t i, j, offset, n_params, n_metas;
struct spa_meta *metas;
uint32_t max_buffers, blocks;
uint32_t min_buffers, max_buffers, blocks;
size_t minsize, stride, align;
uint32_t *data_sizes;
int32_t *data_strides;
@ -253,6 +253,7 @@ int pw_buffers_negotiate(struct pw_context *context, uint32_t flags,
}
max_buffers = context->settings.link_max_buffers;
min_buffers = 1;
align = pw_properties_get_uint32(context->properties, PW_KEY_CPU_MAX_ALIGN, MAX_ALIGN);
@ -306,7 +307,9 @@ int pw_buffers_negotiate(struct pw_context *context, uint32_t flags,
}
if (SPA_FLAG_IS_SET(flags, PW_BUFFERS_FLAG_ASYNC))
max_buffers = SPA_MAX(2u, max_buffers);
min_buffers += 1;
max_buffers = SPA_MAX(min_buffers, max_buffers);
if (SPA_FLAG_IS_SET(flags, PW_BUFFERS_FLAG_SHARED_MEM)) {
if (types != SPA_ID_INVALID)