mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement alsa capture with timers

Browse source 
Add timer based alsa capture support
Improve format negotiation in alsa
Better track buffer owner in the links
This commit is contained in:
Wim Taymans 2017-03-30 17:30:28 +02:00
parent 73ec9e2d24
commit 7b8bb8da6b
10 changed files with 190 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pinos/modules/module-protocol-native.c
View file

@ -134,7 +134,7 @@ connection_data (SpaSource *source,
void *message;
if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
pinos_log_debug ("protocol-native %p: got connection error", client->impl);
pinos_log_error ("protocol-native %p: got connection error", client->impl);
client_destroy (client);
return;
}
@ -144,7 +144,7 @@ connection_data (SpaSource *source,
PinosResource *resource;
const PinosDemarshalFunc *demarshal;
pinos_log_debug ("protocol-native %p: got message %d from %u", client->impl, opcode, id);
pinos_log_trace ("protocol-native %p: got message %d from %u", client->impl, opcode, id);
resource = pinos_map_lookup (&c->objects, id);
if (resource == NULL) {

4
pinos/server/core.c
View file

@ -611,6 +611,10 @@ again:
asprintf (error, "error node state");
goto error;
}
if (format == NULL) {
asprintf (error, "error get format");
goto error;
}
return format;
error:

28
pinos/server/link.c
View file

@ -47,7 +47,7 @@ typedef struct
PinosListener output_port_destroy;
PinosListener output_async_complete;
bool allocated;
void *buffer_owner;
PinosMemblock buffer_mem;
SpaBuffer **buffers;
uint32_t n_buffers;
@ -453,13 +453,20 @@ do_allocation (PinosLink *this, SpaNodeState in_state, SpaNodeState out_state)
(out_flags & SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS))
minsize = 0;
if (this->output->allocated) {
if (this->output->n_buffers) {
out_flags = 0;
in_flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
impl->n_buffers = this->output->n_buffers;
impl->buffers = this->output->buffers;
impl->allocated = false;
impl->buffer_owner = this->output;
pinos_log_debug ("reusing %d output buffers %p", impl->n_buffers, impl->buffers);
} else if (this->input->n_buffers) {
out_flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
in_flags = 0;
impl->n_buffers = this->input->n_buffers;
impl->buffers = this->input->buffers;
impl->buffer_owner = this->input;
pinos_log_debug ("reusing %d input buffers %p", impl->n_buffers, impl->buffers);
} else {
size_t data_sizes[1];
ssize_t data_strides[1];
@ -467,6 +474,7 @@ do_allocation (PinosLink *this, SpaNodeState in_state, SpaNodeState out_state)
data_sizes[0] = minsize;
data_strides[0] = stride;
impl->buffer_owner = this;
impl->n_buffers = max_buffers;
impl->buffers = alloc_buffers (this,
impl->n_buffers,
@ -476,6 +484,8 @@ do_allocation (PinosLink *this, SpaNodeState in_state, SpaNodeState out_state)
data_sizes,
data_strides,
&impl->buffer_mem);
pinos_log_debug ("allocating %d input buffers %p", impl->n_buffers, impl->buffers);
}
if (out_flags & SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS) {
@ -492,7 +502,7 @@ do_allocation (PinosLink *this, SpaNodeState in_state, SpaNodeState out_state)
this->output->n_buffers = impl->n_buffers;
this->output->allocated = true;
this->output->buffer_mem = impl->buffer_mem;
impl->allocated = false;
impl->buffer_owner = this->output;
pinos_log_debug ("allocated %d buffers %p from output port", impl->n_buffers, impl->buffers);
} else if (in_flags & SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS) {
if ((res = spa_node_port_alloc_buffers (this->input->node->node,
@ -508,7 +518,7 @@ do_allocation (PinosLink *this, SpaNodeState in_state, SpaNodeState out_state)
this->input->n_buffers = impl->n_buffers;
this->input->allocated = true;
this->input->buffer_mem = impl->buffer_mem;
impl->allocated = false;
impl->buffer_owner = this->input;
pinos_log_debug ("allocated %d buffers %p from input port", impl->n_buffers, impl->buffers);
}
}
@ -682,7 +692,7 @@ on_port_destroy (PinosLink *this,
} else
return;
if (port->allocated) {
if (impl->buffer_owner == port) {
impl->buffers = NULL;
impl->n_buffers = 0;
@ -743,7 +753,7 @@ pinos_link_free (PinosLink *link)
pinos_work_queue_destroy (impl->work);
if (impl->allocated)
if (impl->buffer_owner == link)
pinos_memblock_free (&impl->buffer_mem);
free (impl);
@ -876,7 +886,9 @@ pinos_link_new (PinosCore *core,
static void
clear_port_buffers (PinosLink *link, PinosPort *port)
{
if (!port->allocated) {
PinosLinkImpl *impl = SPA_CONTAINER_OF (link, PinosLinkImpl, this);
if (impl->buffer_owner != port) {
pinos_log_debug ("link %p: clear buffers on port %p", link, port);
spa_node_port_use_buffers (port->node->node,
port->direction,

4
pinos/server/node.c
View file

@ -323,6 +323,8 @@ on_node_event (SpaNode *node, SpaEvent *event, void *user_data)
if (po->buffer_id == SPA_ID_INVALID)
continue;
pinos_log_trace ("node %p: have output %d", this, po->buffer_id);
outport = this->output_port_map[i];
spa_list_for_each (link, &outport->rt.links, rt.output_link) {
if (link->rt.input == NULL || link->rt.output == NULL)
@ -331,7 +333,6 @@ on_node_event (SpaNode *node, SpaEvent *event, void *user_data)
inport = link->rt.input;
pi = &inport->node->transport->inputs[inport->port_id];
processed = true;
pi->buffer_id = po->buffer_id;
@ -344,6 +345,7 @@ on_node_event (SpaNode *node, SpaEvent *event, void *user_data)
po->buffer_id)) < 0)
pinos_log_warn ("node %p: error reuse buffer: %d", this, res);
processed = true;
po->buffer_id = SPA_ID_INVALID;
}
if (processed) {

7
pinos/server/port.c
View file

@ -65,13 +65,6 @@ pinos_port_destroy (PinosPort *port)
spa_list_remove (&port->link);
spa_node_port_use_buffers (port->node->node,
port->direction,
port->port_id,
NULL, 0);
port->buffers = NULL;
port->n_buffers = 0;
free (port);
}