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

client-node: also implement io on the node itself

Browse source
This commit is contained in:
Wim Taymans 2018-07-03 21:45:07 +02:00
parent 79a3b594f9
commit 1b4a0e8d5d
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -638,9 +638,9 @@ impl_node_port_set_param(struct spa_node *node,
} }
static int do_port_set_io(struct impl *impl, static int do_port_set_io(struct impl *impl,
enum spa_direction direction, uint32_t port_id, enum spa_direction direction, uint32_t port_id,
struct pw_port_mix *mix, uint32_t mix_port_id,
uint32_t id, void *data, size_t size) uint32_t id, void *data, size_t size)
{ {
struct node *this = &impl->node; struct node *this = &impl->node;
struct pw_type *t = impl->t; struct pw_type *t = impl->t;
@ -651,7 +651,7 @@ static int do_port_set_io(struct impl *impl,
pw_log_debug("client-node %p: %s port %d.%d set io %p %zd", impl, pw_log_debug("client-node %p: %s port %d.%d set io %p %zd", impl,
direction == SPA_DIRECTION_INPUT ? "input" : "output", direction == SPA_DIRECTION_INPUT ? "input" : "output",
port_id, mix->port.port_id, data, size); port_id, mix_port_id, data, size);
if (!CHECK_PORT(this, direction, port_id)) if (!CHECK_PORT(this, direction, port_id))
return -EINVAL; return -EINVAL;
@ -678,15 +678,13 @@ static int do_port_set_io(struct impl *impl,
memid = SPA_ID_INVALID; memid = SPA_ID_INVALID;
mem_offset = mem_size = 0; mem_offset = mem_size = 0;
} }
if (id == t->io.Buffers)
mix->io = data;
update_io(impl, port, mix->port.port_id, id, memid); update_io(impl, port, mix_port_id, id, memid);
pw_client_node_resource_port_set_io(this->resource, pw_client_node_resource_port_set_io(this->resource,
this->seq, this->seq,
direction, port_id, direction, port_id,
mix->port.port_id, mix_port_id,
id, id,
memid, memid,
mem_offset, mem_size); mem_offset, mem_size);
@ -701,7 +699,13 @@ impl_node_port_set_io(struct spa_node *node,
uint32_t id, uint32_t id,
void *data, size_t size) void *data, size_t size)
{ {
return -ENOTSUP; struct node *this;
struct impl *impl;
this = SPA_CONTAINER_OF(node, struct node, node);
impl = this->impl;
return do_port_set_io(impl, direction, port_id, 0, id, data, size);
} }
static int static int
@ -1274,13 +1278,21 @@ static int mix_port_set_io(struct spa_node *node,
struct pw_port *p = SPA_CONTAINER_OF(node, struct pw_port, mix_node); struct pw_port *p = SPA_CONTAINER_OF(node, struct pw_port, mix_node);
struct impl *impl = p->owner_data; struct impl *impl = p->owner_data;
struct pw_port_mix *mix; struct pw_port_mix *mix;
struct pw_type *t = impl->t;
mix = pw_map_lookup(&p->mix_port_map, port_id); mix = pw_map_lookup(&p->mix_port_map, port_id);
if (mix == NULL) if (mix == NULL)
return -EIO; return -EIO;
if (id == t->io.Buffers) {
if (data && size >= sizeof(struct spa_io_buffers))
mix->io = data;
else
mix->io = NULL;
}
return do_port_set_io(impl, return do_port_set_io(impl,
direction, p->port_id, mix, direction, p->port_id, mix->port.port_id,
id, data, size); id, data, size);
} }