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

audio-dsp: use flag to check if buffer is filled

Browse source 
Only produce a filled buffer otherwise produce an empty buffer.
Handle different buffer sizes.
Also link to a mixer
This commit is contained in:
Wim Taymans 2018-03-09 12:39:14 +01:00
parent c018d27078
commit ad6ecf6be8
1 changed files with 52 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

90
src/modules/module-audio-dsp.c
View file

@ -76,7 +76,8 @@ struct impl {
}; };
struct buffer { struct buffer {
#define BUFFER_FLAG_OUT (1<<0) #define BUFFER_FLAG_OUT (1<<0)
#define BUFFER_FLAG_FILLED (1<<1)
uint32_t flags; uint32_t flags;
struct spa_list link; struct spa_list link;
struct spa_buffer *outbuf; struct spa_buffer *outbuf;
@ -217,7 +218,7 @@ static void recycle_buffer(struct node *n, struct port *p, uint32_t id)
if (SPA_FLAG_CHECK(b->flags, BUFFER_FLAG_OUT)) { if (SPA_FLAG_CHECK(b->flags, BUFFER_FLAG_OUT)) {
pw_log_trace("recycle buffer %d", id); pw_log_trace("recycle buffer %d", id);
spa_list_append(&p->queue, &b->link); spa_list_append(&p->queue, &b->link);
SPA_FLAG_UNSET(b->flags, BUFFER_FLAG_OUT); SPA_FLAG_UNSET(b->flags, BUFFER_FLAG_OUT | BUFFER_FLAG_FILLED);
} }
} }
@ -268,15 +269,10 @@ static struct buffer * peek_buffer(struct node *n, struct port *p)
return spa_list_first(&p->queue, struct buffer, link); return spa_list_first(&p->queue, struct buffer, link);
} }
static struct buffer * dequeue_buffer(struct node *n, struct port *p) static void dequeue_buffer(struct node *n, struct buffer *b)
{ {
struct buffer *b; spa_list_remove(&b->link);
SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT);
if ((b = peek_buffer(n, p)) != NULL) {
spa_list_remove(&b->link);
SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT);
}
return b;
} }
static int node_process_input(struct spa_node *node) static int node_process_input(struct spa_node *node)
@ -292,19 +288,25 @@ static int node_process_input(struct spa_node *node)
if (outio->status == SPA_STATUS_HAVE_BUFFER) if (outio->status == SPA_STATUS_HAVE_BUFFER)
return SPA_STATUS_HAVE_BUFFER; return SPA_STATUS_HAVE_BUFFER;
out = dequeue_buffer(n, outp); out = peek_buffer(n, outp);
if (out == NULL) { if (out == NULL) {
pw_log_warn(NAME " %p: out of buffers", this); pw_log_warn(NAME " %p: out of buffers", this);
return -EPIPE; return -EPIPE;
} }
outio->buffer_id = out->outbuf->id; if (SPA_FLAG_CHECK(out->flags, BUFFER_FLAG_FILLED)) {
outio->status = SPA_STATUS_HAVE_BUFFER; dequeue_buffer(n, out);
outio->buffer_id = out->outbuf->id;
out->outbuf->datas[0].chunk->offset = 0; outio->status = SPA_STATUS_HAVE_BUFFER;
out->outbuf->datas[0].chunk->size = n->buffer_size * sizeof(int16_t) * 2;
out->outbuf->datas[0].chunk->stride = 0;
out->outbuf->datas[0].chunk->offset = 0;
out->outbuf->datas[0].chunk->size = n->buffer_size * sizeof(int16_t) * 2;
out->outbuf->datas[0].chunk->stride = 0;
}
else {
outio->buffer_id = SPA_ID_INVALID;
outio->status = SPA_STATUS_HAVE_BUFFER;
}
return outio->status; return outio->status;
} }
@ -316,7 +318,7 @@ static int node_process_output(struct spa_node *node)
struct spa_io_buffers *outio = outp->io; struct spa_io_buffers *outio = outp->io;
int i; int i;
pw_log_trace(NAME " %p: process output", this); pw_log_trace(NAME " %p: process output %d", this, outio->status);
if (outio->status == SPA_STATUS_HAVE_BUFFER) if (outio->status == SPA_STATUS_HAVE_BUFFER)
return SPA_STATUS_HAVE_BUFFER; return SPA_STATUS_HAVE_BUFFER;
@ -325,18 +327,23 @@ static int node_process_output(struct spa_node *node)
recycle_buffer(n, outp, outio->buffer_id); recycle_buffer(n, outp, outio->buffer_id);
outio->buffer_id = SPA_ID_INVALID; outio->buffer_id = SPA_ID_INVALID;
} }
outio->status = SPA_STATUS_OK; if (n->n_in_ports == 0) {
outio->buffer_id = SPA_ID_INVALID;
for (i = 0; i < n->n_in_ports; i++) { outio->status = SPA_STATUS_HAVE_BUFFER;
struct port *inp = GET_IN_PORT(n, i);
struct spa_io_buffers *inio = inp->io;
if (inio == NULL || inp->n_buffers == 0)
continue;
inio->status = SPA_STATUS_NEED_BUFFER;
} }
return SPA_STATUS_NEED_BUFFER; else {
for (i = 0; i < n->n_in_ports; i++) {
struct port *inp = GET_IN_PORT(n, i);
struct spa_io_buffers *inio = inp->io;
if (inio == NULL)
continue;
inio->status = SPA_STATUS_NEED_BUFFER;
}
outio->status = SPA_STATUS_NEED_BUFFER;
}
return outio->status;
} }
static int port_set_io(struct spa_node *node, static int port_set_io(struct spa_node *node,
@ -452,7 +459,8 @@ static int port_enum_params(struct spa_node *node,
param = spa_pod_builder_object(&b, param = spa_pod_builder_object(&b,
id, t->param_buffers.Buffers, id, t->param_buffers.Buffers,
":", t->param_buffers.size, "i", n->buffer_size * sizeof(float), ":", t->param_buffers.size, "iru", n->buffer_size * sizeof(float),
SPA_POD_PROP_MIN_MAX(24, 4096),
":", t->param_buffers.stride, "i", 0, ":", t->param_buffers.stride, "i", 0,
":", t->param_buffers.buffers, "ir", 2, ":", t->param_buffers.buffers, "ir", 2,
SPA_POD_PROP_MIN_MAX(1, MAX_BUFFERS), SPA_POD_PROP_MIN_MAX(1, MAX_BUFFERS),
@ -534,6 +542,9 @@ static int port_use_buffers(struct spa_node *node, enum spa_direction direction,
b = &p->buffers[i]; b = &p->buffers[i];
b->flags = 0; b->flags = 0;
b->outbuf = buffers[i]; b->outbuf = buffers[i];
n->buffer_size = d[0].maxsize / 4;
if ((d[0].type == t->data.MemPtr || if ((d[0].type == t->data.MemPtr ||
d[0].type == t->data.MemFd || d[0].type == t->data.MemFd ||
d[0].type == t->data.DmaBuf) && d[0].data != NULL) { d[0].type == t->data.DmaBuf) && d[0].data != NULL) {
@ -655,18 +666,19 @@ static int schedule_mix_input(struct spa_node *_node)
pw_log_trace("mix %p: input %p %p->%p %d %d", node, pw_log_trace("mix %p: input %p %p->%p %d %d", node,
gp, gp->io, io, gp->io->status, gp->io->buffer_id); gp, gp->io, io, gp->io->status, gp->io->buffer_id);
gp->io->status = SPA_STATUS_OK;
gp->io->buffer_id = SPA_ID_INVALID;
} }
outb = peek_buffer(n, outp); outb = peek_buffer(n, outp);
if (out == NULL) if (outb == NULL)
return -EPIPE;
if (layer == 0) {
fill_s16(outb->ptr, port->port_id, buffer_size, stride); fill_s16(outb->ptr, port->port_id, buffer_size, stride);
else }
else {
conv_f32_s16(outb->ptr, port->port_id, out, buffer_size, stride); conv_f32_s16(outb->ptr, port->port_id, out, buffer_size, stride);
SPA_FLAG_SET(outb->flags, BUFFER_FLAG_FILLED);
}
return SPA_STATUS_HAVE_BUFFER; return SPA_STATUS_HAVE_BUFFER;
} }
@ -679,6 +691,8 @@ static int schedule_mix_output(struct spa_node *_node)
struct spa_io_buffers *io = port->rt.mix_port.io; struct spa_io_buffers *io = port->rt.mix_port.io;
spa_list_for_each(gp, &node->ports[SPA_DIRECTION_INPUT], link) { spa_list_for_each(gp, &node->ports[SPA_DIRECTION_INPUT], link) {
pw_log_trace("port %p: port %d %d %p->%p %d %d", port,
gp->port_id, gp->flags, io, gp->io, io->status, io->buffer_id);
if (gp->flags & SPA_GRAPH_PORT_FLAG_DISABLED) if (gp->flags & SPA_GRAPH_PORT_FLAG_DISABLED)
continue; continue;
*gp->io = *io; *gp->io = *io;
@ -856,7 +870,7 @@ static int on_global(void *data, struct pw_global *global)
if ((str = pw_properties_get(properties, "media.class")) == NULL) if ((str = pw_properties_get(properties, "media.class")) == NULL)
return 0; return 0;
if (strcmp(str, "Audio/Sink") == 0) { if (strcmp(str, "Audio/Sink") == 0 || strcmp(str, "Audio/Mixer") == 0) {
if ((ip = pw_node_get_free_port(n, PW_DIRECTION_INPUT)) == NULL) if ((ip = pw_node_get_free_port(n, PW_DIRECTION_INPUT)) == NULL)
return 0; return 0;
if ((node = make_node(impl, properties, PW_DIRECTION_OUTPUT)) == NULL) if ((node = make_node(impl, properties, PW_DIRECTION_OUTPUT)) == NULL)