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

graph: remove io from graph port, it's not needed

Browse source
This commit is contained in:
Wim Taymans 2018-05-08 12:21:57 +02:00
parent 249110eb79
commit d93dd5ec93
10 changed files with 47 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/module-audio-session/audio-dsp.c
View file

@ -746,7 +746,6 @@ static int schedule_mix(struct spa_node *_node)
struct port *outp = GET_OUT_PORT(n, 0);
struct spa_graph_node *node = &port->rt.mix_node;
struct spa_graph_port *gp;
struct spa_io_buffers *io = port->rt.mix_port.io;
size_t buffer_size = 0;
struct buffer *outb;
float *out = NULL;
@ -760,7 +759,7 @@ static int schedule_mix(struct spa_node *_node)
struct spa_io_buffers *inio;
struct spa_buffer *inb;
if ((inio = gp->io) == NULL ||
if ((inio = mix->io) == NULL ||
inio->buffer_id >= mix->n_buffers ||
inio->status != SPA_STATUS_HAVE_BUFFER)
continue;
@ -778,7 +777,7 @@ static int schedule_mix(struct spa_node *_node)
add_f32(out, inb->datas[0].data, buffer_size);
}
pw_log_trace("mix %p: input %p %p %zd", node, inio, io, buffer_size);
pw_log_trace("mix %p: input %p %p %zd", node, inio, mix->io, buffer_size);
}
outb = peek_buffer(n, outp);

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

@ -676,6 +676,7 @@ static int do_port_set_io(struct impl *impl,
memid = SPA_ID_INVALID;
mem_offset = mem_size = 0;
}
mix->io = data;
update_io(impl, port, mix->port.port_id, id, memid);
pw_client_node_resource_port_set_io(this->resource,
@ -1215,8 +1216,6 @@ static int port_init_mix(void *data, struct pw_port_mix *mix)
mix->io->buffer_id = SPA_ID_INVALID;
mix->io->status = SPA_STATUS_NEED_BUFFER;
mix->port.io = mix->io;
pw_log_debug("client-node %p: init mix io %d %p %p", impl, mix->id, mix->io,
impl->io_areas->ptr);
@ -1248,9 +1247,6 @@ static int mix_port_set_io(struct spa_node *node,
struct impl *impl = p->owner_data;
struct pw_port_mix *mix;
p->rt.port.io = data;
p->rt.mix_port.io = data;
mix = pw_map_lookup(&p->mix_port_map, port_id);
if (mix == NULL)
return -EIO;
@ -1262,11 +1258,6 @@ static int mix_port_set_io(struct spa_node *node,
static int mix_port_process(struct spa_node *data)
{
struct pw_port *p = SPA_CONTAINER_OF(data, struct pw_port, mix_node);
struct spa_io_buffers *io = p->rt.mix_port.io;
if (io != NULL) {
pw_log_trace("client-node %p: pass %d %d", data, io->status, io->buffer_id);
}
return SPA_STATUS_HAVE_BUFFER;
}