mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

buffers: increase max datas and metadata in buffers

Browse source
This commit is contained in:
Wim Taymans 2020-07-01 11:40:13 +02:00
parent f678f4371d
commit dfd3bd84b4
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/module-client-node/client-node.c
View file

@ -50,6 +50,8 @@
#define MAX_OUTPUTS 64 #define MAX_OUTPUTS 64
#define MAX_BUFFERS 64 #define MAX_BUFFERS 64
#define MAX_METAS 16u
#define MAX_DATAS 64u
#define MAX_AREAS 1024 #define MAX_AREAS 1024
#define MAX_MIX 128 #define MAX_MIX 128
@ -72,8 +74,8 @@
struct buffer { struct buffer {
struct spa_buffer *outbuf; struct spa_buffer *outbuf;
struct spa_buffer buffer; struct spa_buffer buffer;
struct spa_meta metas[4]; struct spa_meta metas[MAX_METAS];
struct spa_data datas[4]; struct spa_data datas[MAX_DATAS];
struct pw_memblock *mem; struct pw_memblock *mem;
}; };
@ -814,11 +816,12 @@ do_port_use_buffers(struct impl *impl,
spa_log_debug(this->log, NAME" %p: buffer %d %d %d %d", this, i, mb[i].mem_id, spa_log_debug(this->log, NAME" %p: buffer %d %d %d %d", this, i, mb[i].mem_id,
mb[i].offset, mb[i].size); mb[i].offset, mb[i].size);
for (j = 0; j < buffers[i]->n_metas; j++) b->buffer.n_metas = SPA_MIN(buffers[i]->n_metas, MAX_METAS);
for (j = 0; j < b->buffer.n_metas; j++)
memcpy(&b->buffer.metas[j], &buffers[i]->metas[j], sizeof(struct spa_meta)); memcpy(&b->buffer.metas[j], &buffers[i]->metas[j], sizeof(struct spa_meta));
b->buffer.n_metas = j;
for (j = 0; j < buffers[i]->n_datas; j++) { b->buffer.n_datas = SPA_MIN(buffers[i]->n_datas, MAX_DATAS);
for (j = 0; j < b->buffer.n_datas; j++) {
struct spa_data *d = &buffers[i]->datas[j]; struct spa_data *d = &buffers[i]->datas[j];
memcpy(&b->datas[j], d, sizeof(struct spa_data)); memcpy(&b->datas[j], d, sizeof(struct spa_data));
@ -1070,7 +1073,7 @@ static int client_node_port_buffers(void *data,
if (oldbuf->n_datas != newbuf->n_datas) if (oldbuf->n_datas != newbuf->n_datas)
return -EINVAL; return -EINVAL;
for (j = 0; j < newbuf->n_datas; j++) { for (j = 0; j < b->buffer.n_datas; j++) {
struct spa_chunk *oldchunk = oldbuf->datas[j].chunk; struct spa_chunk *oldchunk = oldbuf->datas[j].chunk;
struct spa_data *d = &newbuf->datas[j]; struct spa_data *d = &newbuf->datas[j];

2
src/pipewire/buffers.c
View file

@ -39,7 +39,7 @@
#define NAME "buffers" #define NAME "buffers"
#define MAX_ALIGN 32 #define MAX_ALIGN 32
#define MAX_BLOCKS 4u #define MAX_BLOCKS 64u
struct port { struct port {
struct spa_node *node; struct spa_node *node;