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

alloc: improve alignment in alloactor

Browse source 
link: use buffer allocator
Add more tests
This commit is contained in:
Wim Taymans 2019-01-25 13:28:56 +01:00
parent 30ecf66561
commit 93e8074b2c
5 changed files with 89 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/module-client-node/client-stream.c
View file

@ -543,7 +543,7 @@ static int negotiate_buffers(struct impl *impl)
int res, i;
bool in_alloc, out_alloc;
int32_t size, buffers, blocks, align, flags;
uint32_t *aligns, data_size;
uint32_t *aligns;
struct spa_data *datas;
const struct spa_port_info *in_info, *out_info;
struct spa_buffer_alloc_info info = { 0, };
@ -622,7 +622,6 @@ static int negotiate_buffers(struct impl *impl)
}
spa_buffer_alloc_fill_info(&info, 0, NULL, blocks, datas, aligns);
info.skel_size = SPA_ROUND_UP_N(info.skel_size, 16);
free(impl->buffers);
impl->buffers = calloc(buffers, sizeof(struct spa_buffer *) + info.skel_size);
@ -630,7 +629,6 @@ static int negotiate_buffers(struct impl *impl)
return -ENOMEM;
skel = SPA_MEMBER(impl->buffers, sizeof(struct spa_buffer *) * buffers, void);
data_size = info.meta_size + info.chunk_size + info.data_size;
if (impl->mem) {
pw_memblock_free(impl->mem);
@ -639,7 +637,7 @@ static int negotiate_buffers(struct impl *impl)
if ((res = pw_memblock_alloc(PW_MEMBLOCK_FLAG_WITH_FD |
PW_MEMBLOCK_FLAG_MAP_READWRITE |
PW_MEMBLOCK_FLAG_SEAL, buffers * data_size,
PW_MEMBLOCK_FLAG_SEAL, buffers * info.mem_size,
&impl->mem)) < 0)
return res;