mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: improve buffer usage

Browse source 
Buffer on the output port are set on the mix once and used for
all output mix ios. Find the mix with the buffers and use that on
all output mix.
This commit is contained in:
Wim Taymans 2019-08-07 12:58:09 +02:00
parent d405ca97ec
commit f84821f821
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/pipewire-jack.c
View file

@ -1317,7 +1317,7 @@ static int client_node_port_set_io(void *object,
ptr = mm->ptr; ptr = mm->ptr;
} }
pw_log_debug("port %p: set io:%s id:%u ptr:%p", p, pw_log_debug("port %p: mix:%d set io:%s id:%u ptr:%p", p, mix_id,
spa_debug_type_find_name(spa_type_io, id), id, ptr); spa_debug_type_find_name(spa_type_io, id), id, ptr);
switch (id) { switch (id) {
@ -2350,8 +2350,6 @@ void * jack_port_get_buffer (jack_port_t *port, jack_nframes_t frames)
struct object *o = (struct object *) port; struct object *o = (struct object *) port;
struct client *c = o->client; struct client *c = o->client;
struct port *p; struct port *p;
struct buffer *b;
struct spa_io_buffers *io;
struct mix *mix; struct mix *mix;
void *ptr = NULL; void *ptr = NULL;
@ -2371,18 +2369,22 @@ void * jack_port_get_buffer (jack_port_t *port, jack_nframes_t frames)
break; break;
} }
} else { } else {
b = NULL; struct spa_io_buffers io;
spa_list_for_each(mix, &p->mix, port_link) {
pw_log_trace("port %p: mix %d.%d get buffer %d",
p, p->id, mix->id, frames);
io = mix->io;
if (mix->n_buffers == 0 || io == NULL) io.status = -EPIPE;
io.buffer_id = SPA_ID_INVALID;
spa_list_for_each(mix, &p->mix, port_link) {
struct buffer *b;
pw_log_trace("port %p: mix %d.%d get buffer %d io:%p n_buffers:%d",
p, p->id, mix->id, frames, mix->io, mix->n_buffers);
if (mix->n_buffers == 0)
continue; continue;
if ((b = dequeue_buffer(mix)) == NULL) { if ((b = dequeue_buffer(mix)) == NULL) {
pw_log_warn("port %p: out of buffers", p); pw_log_warn("port %p: out of buffers", p);
io->buffer_id = SPA_ID_INVALID;
goto done; goto done;
} }
reuse_buffer(c, mix, b->id); reuse_buffer(c, mix, b->id);
@ -2392,15 +2394,15 @@ void * jack_port_get_buffer (jack_port_t *port, jack_nframes_t frames)
b->datas[0].chunk->size = frames * sizeof(float); b->datas[0].chunk->size = frames * sizeof(float);
b->datas[0].chunk->stride = sizeof(float); b->datas[0].chunk->stride = sizeof(float);
io->status = SPA_STATUS_HAVE_BUFFER; io.status = SPA_STATUS_HAVE_BUFFER;
io->buffer_id = b->id; io.buffer_id = b->id;
break; break;
} }
spa_list_for_each(mix, &p->mix, port_link) { spa_list_for_each(mix, &p->mix, port_link) {
struct spa_io_buffers *mio = mix->io; struct spa_io_buffers *mio = mix->io;
if (mio == NULL) if (mio == NULL)
continue; continue;
*mio = *io; *mio = io;
} }
} }