mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: optimize one buffer case

Browse source 
The normal case is using 1 buffer port port so we can avoid a
queue/dequeue pair of operations.
This commit is contained in:
Wim Taymans 2023-11-22 13:20:52 +01:00
parent 33a3990c3c
commit f324f0e8e1
1 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

55
pipewire-jack/src/pipewire-jack.c
View file

@ -857,21 +857,6 @@ static struct object *find_link(struct client *c, uint32_t src, uint32_t dst)
return NULL; return NULL;
} }
static inline struct buffer *dequeue_buffer(struct client *c, struct mix *mix)
{
struct buffer *b;
if (SPA_UNLIKELY(spa_list_is_empty(&mix->queue)))
return NULL;
b = spa_list_first(&mix->queue, struct buffer, link);
spa_list_remove(&b->link);
SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT);
pw_log_trace_fp("%p: port %p: dequeue buffer %d", c, mix->port, b->id);
return b;
}
#if defined (__SSE__) #if defined (__SSE__)
#include <xmmintrin.h> #include <xmmintrin.h>
static void mix_sse(float *dst, float *src[], uint32_t n_src, bool aligned, uint32_t n_samples) static void mix_sse(float *dst, float *src[], uint32_t n_src, bool aligned, uint32_t n_samples)
@ -1327,7 +1312,7 @@ static void client_remove_source(struct client *c)
} }
} }
static inline void reuse_buffer(struct client *c, struct mix *mix, uint32_t id) static inline void queue_buffer(struct client *c, struct mix *mix, uint32_t id)
{ {
struct buffer *b; struct buffer *b;
@ -1340,6 +1325,21 @@ static inline void reuse_buffer(struct client *c, struct mix *mix, uint32_t id)
} }
} }
static inline struct buffer *dequeue_buffer(struct client *c, struct mix *mix)
{
struct buffer *b;
if (SPA_UNLIKELY(spa_list_is_empty(&mix->queue)))
return NULL;
b = spa_list_first(&mix->queue, struct buffer, link);
spa_list_remove(&b->link);
SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT);
pw_log_trace_fp("%p: port %p: dequeue buffer %d", c, mix->port, b->id);
return b;
}
static size_t convert_from_midi(void *midi, void *buffer, size_t size) static size_t convert_from_midi(void *midi, void *buffer, size_t size)
{ {
@ -1487,21 +1487,26 @@ static inline void *get_buffer_output(struct port *p, uint32_t frames, uint32_t
b = &mix->buffers[io->buffer_id]; b = &mix->buffers[io->buffer_id];
d = &b->datas[0]; d = &b->datas[0];
} else { } else {
if (io->buffer_id < mix->n_buffers) { if (mix->n_buffers == 1) {
reuse_buffer(c, mix, io->buffer_id); b = &mix->buffers[0];
io->buffer_id = SPA_ID_INVALID; } else {
} if (io->buffer_id < mix->n_buffers)
if (SPA_UNLIKELY((b = dequeue_buffer(c, mix)) == NULL)) { queue_buffer(c, mix, io->buffer_id);
pw_log_warn("port %p: out of buffers %d", p, mix->n_buffers); b = dequeue_buffer(c, mix);
return NULL;
if (SPA_UNLIKELY(b == NULL)) {
pw_log_warn("port %p: out of buffers %d", p, mix->n_buffers);
io->buffer_id = SPA_ID_INVALID;
return NULL;
}
} }
d = &b->datas[0]; d = &b->datas[0];
d->chunk->offset = 0; d->chunk->offset = 0;
d->chunk->size = frames * sizeof(float); d->chunk->size = frames * sizeof(float);
d->chunk->stride = stride; d->chunk->stride = stride;
io->status = SPA_STATUS_HAVE_DATA;
io->buffer_id = b->id; io->buffer_id = b->id;
io->status = SPA_STATUS_HAVE_DATA;
} }
ptr = d->data; ptr = d->data;
if (buf) if (buf)
@ -2717,7 +2722,7 @@ static int client_node_port_use_buffers(void *data,
} }
SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT); SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT);
if (direction == SPA_DIRECTION_OUTPUT) if (direction == SPA_DIRECTION_OUTPUT)
reuse_buffer(c, mix, b->id); queue_buffer(c, mix, b->id);
} }
pw_log_debug("%p: have %d buffers", c, n_buffers); pw_log_debug("%p: have %d buffers", c, n_buffers);