mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-06 13:30:01 -05:00
port: handle control only ports
Mark ports with only control io as control ports and skip negotiation of buffers and format for them.
This commit is contained in:
Wim Taymans
parent
909abdb6bf
commit
18408dad81
4 changed files with 62 additions and 30 deletions
|
|
@ -32,18 +32,12 @@ struct impl {
|
|||
struct pw_control *
|
||||
pw_control_new(struct pw_core *core,
|
||||
struct pw_port *port,
|
||||
const struct spa_pod *param,
|
||||
uint32_t id, uint32_t size,
|
||||
size_t user_data_size)
|
||||
{
|
||||
struct impl *impl;
|
||||
struct pw_control *this;
|
||||
enum spa_direction direction;
|
||||
uint32_t id, size;
|
||||
|
||||
if (spa_pod_object_parse(param,
|
||||
":", SPA_PARAM_IO_id, "I", &id,
|
||||
":", SPA_PARAM_IO_size, "i", &size) < 0)
|
||||
goto exit;
|
||||
|
||||
switch (id) {
|
||||
case SPA_IO_Control:
|
||||
|
|
@ -69,7 +63,6 @@ pw_control_new(struct pw_core *core,
|
|||
|
||||
this->core = core;
|
||||
this->port = port;
|
||||
this->param = pw_spa_pod_copy(param);
|
||||
this->direction = direction;
|
||||
|
||||
spa_list_init(&this->inputs);
|
||||
|
|
@ -123,9 +116,6 @@ void pw_control_destroy(struct pw_control *control)
|
|||
if (impl->mem)
|
||||
pw_memblock_free(impl->mem);
|
||||
}
|
||||
|
||||
free(control->param);
|
||||
|
||||
free(control);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -897,6 +897,11 @@ static int check_states(struct pw_link *this, void *user_data, int res)
|
|||
return -EIO;
|
||||
}
|
||||
|
||||
if (PW_PORT_IS_CONTROL(output) && PW_PORT_IS_CONTROL(input)) {
|
||||
this->rt.in_mix.state = PW_PORT_STATE_PAUSED;
|
||||
this->rt.out_mix.state = PW_PORT_STATE_PAUSED;
|
||||
}
|
||||
|
||||
in_mix_state = this->rt.in_mix.state;
|
||||
out_mix_state = this->rt.out_mix.state;
|
||||
|
||||
|
|
|
|||
|
|
@ -104,6 +104,9 @@ static int schedule_mix_input(struct spa_node *data)
|
|||
struct spa_graph_port *p;
|
||||
struct spa_io_buffers *io = &this->rt.io;
|
||||
|
||||
if (PW_PORT_IS_CONTROL(this))
|
||||
return SPA_STATUS_HAVE_BUFFER | SPA_STATUS_NEED_BUFFER;
|
||||
|
||||
spa_list_for_each(p, &node->ports[SPA_DIRECTION_INPUT], link) {
|
||||
struct pw_port_mix *mix = SPA_CONTAINER_OF(p, struct pw_port_mix, port);
|
||||
pw_log_trace("port %p: mix input %d %p->%p %d %d", this,
|
||||
|
|
@ -342,11 +345,29 @@ static int do_add_port(struct spa_loop *loop,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int make_control(void *data, uint32_t id, uint32_t index, uint32_t next, struct spa_pod *param)
|
||||
static int check_param_io(void *data, uint32_t id, uint32_t index, uint32_t next, struct spa_pod *param)
|
||||
{
|
||||
struct pw_port *port = data;
|
||||
struct pw_node *node = port->node;
|
||||
pw_control_new(node->core, port, param, 0);
|
||||
uint32_t pid, psize;
|
||||
|
||||
if (spa_pod_object_parse(param,
|
||||
":", SPA_PARAM_IO_id, "I", &pid,
|
||||
":", SPA_PARAM_IO_size, "i", &psize) < 0)
|
||||
return 0;
|
||||
|
||||
switch (pid) {
|
||||
case SPA_IO_Control:
|
||||
case SPA_IO_Notify:
|
||||
pw_control_new(node->core, port, pid, psize, 0);
|
||||
SPA_FLAG_SET(port->flags, PW_PORT_FLAG_CONTROL);
|
||||
break;
|
||||
case SPA_IO_Buffers:
|
||||
SPA_FLAG_SET(port->flags, PW_PORT_FLAG_BUFFERS);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -461,6 +482,7 @@ int pw_port_add(struct pw_port *port, struct pw_node *node)
|
|||
struct pw_port *find;
|
||||
const char *str, *dir;
|
||||
int res;
|
||||
bool control;
|
||||
|
||||
if (port->node != NULL)
|
||||
return -EEXIST;
|
||||
|
|
@ -486,7 +508,7 @@ int pw_port_add(struct pw_port *port, struct pw_node *node)
|
|||
if ((res = spa_node_add_port(node->node, port->direction, port_id)) < 0)
|
||||
goto add_failed;
|
||||
|
||||
port->to_remove = true;
|
||||
SPA_FLAG_SET(port->flags, PW_PORT_FLAG_TO_REMOVE);
|
||||
|
||||
/* try again */
|
||||
if ((res = spa_node_port_get_info(node->node,
|
||||
|
|
@ -500,12 +522,20 @@ int pw_port_add(struct pw_port *port, struct pw_node *node)
|
|||
if (port->spa_info->props)
|
||||
pw_port_update_properties(port, port->spa_info->props);
|
||||
|
||||
pw_port_for_each_param(port, SPA_PARAM_IO, 0, 0, NULL, check_param_io, port);
|
||||
|
||||
dir = port->direction == PW_DIRECTION_INPUT ? "in" : "out";
|
||||
pw_properties_set(port->properties, "port.direction", dir);
|
||||
|
||||
control = PW_PORT_IS_CONTROL(port);
|
||||
if (control) {
|
||||
dir = port->direction == PW_DIRECTION_INPUT ? "control" : "notify";
|
||||
pw_properties_set(port->properties, "port.control", "1");
|
||||
}
|
||||
|
||||
if ((str = pw_properties_get(port->properties, "port.name")) == NULL) {
|
||||
pw_properties_setf(port->properties, "port.name", "%s_%d", dir, port_id);
|
||||
}
|
||||
pw_properties_set(port->properties, "port.direction", dir);
|
||||
|
||||
if (SPA_FLAG_CHECK(port->spa_info->flags, SPA_PORT_INFO_FLAG_PHYSICAL))
|
||||
pw_properties_set(port->properties, "port.physical", "1");
|
||||
|
|
@ -525,19 +555,21 @@ int pw_port_add(struct pw_port *port, struct pw_node *node)
|
|||
node->info.change_mask |= PW_NODE_CHANGE_MASK_OUTPUT_PORTS;
|
||||
}
|
||||
|
||||
pw_port_for_each_param(port, SPA_PARAM_IO, 0, 0, NULL, make_control, port);
|
||||
if (control) {
|
||||
pw_log_debug("port %p: setting node control", port);
|
||||
} else {
|
||||
pw_log_debug("port %p: setting node io", port);
|
||||
spa_node_port_set_io(node->node,
|
||||
port->direction, port_id,
|
||||
SPA_IO_Buffers,
|
||||
&port->rt.io, sizeof(port->rt.io));
|
||||
|
||||
pw_log_debug("port %p: setting node io", port);
|
||||
spa_node_port_set_io(node->node,
|
||||
port->direction, port_id,
|
||||
SPA_IO_Buffers,
|
||||
&port->rt.io, sizeof(port->rt.io));
|
||||
|
||||
if (port->mix && port->mix->port_set_io) {
|
||||
spa_node_port_set_io(port->mix,
|
||||
if (port->mix->port_set_io) {
|
||||
spa_node_port_set_io(port->mix,
|
||||
pw_direction_reverse(port->direction), 0,
|
||||
SPA_IO_Buffers,
|
||||
&port->rt.io, sizeof(port->rt.io));
|
||||
}
|
||||
}
|
||||
|
||||
if (spa_node_port_set_io(node->node,
|
||||
|
|
@ -609,7 +641,7 @@ static void pw_port_remove(struct pw_port *port)
|
|||
pw_loop_invoke(port->node->data_loop, do_remove_port,
|
||||
SPA_ID_INVALID, NULL, 0, true, port);
|
||||
|
||||
if (port->to_remove) {
|
||||
if (SPA_FLAG_CHECK(port->flags, PW_PORT_FLAG_TO_REMOVE)) {
|
||||
if ((res = spa_node_remove_port(node->node, port->direction, port->port_id)) < 0)
|
||||
pw_log_warn("port %p: can't remove: %s", port, spa_strerror(res));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -385,15 +385,21 @@ struct pw_port_implementation {
|
|||
#define pw_port_events_control_added(p,c) pw_port_events_emit(p, control_added, 0, c)
|
||||
#define pw_port_events_control_removed(p,c) pw_port_events_emit(p, control_removed, 0, c)
|
||||
|
||||
#define PW_PORT_IS_CONTROL(port) SPA_FLAG_MASK(port->flags, \
|
||||
PW_PORT_FLAG_BUFFERS|PW_PORT_FLAG_CONTROL,\
|
||||
PW_PORT_FLAG_CONTROL)
|
||||
struct pw_port {
|
||||
struct spa_list link; /**< link in node port_list */
|
||||
|
||||
struct pw_node *node; /**< owner node */
|
||||
struct pw_global *global; /**< global for this port */
|
||||
struct spa_hook global_listener;
|
||||
bool registered;
|
||||
bool to_remove; /**< if the port should be removed from the
|
||||
* implementation when destroyed */
|
||||
|
||||
#define PW_PORT_FLAG_TO_REMOVE (1<<0) /**< if the port should be removed from the
|
||||
* implementation when destroyed */
|
||||
#define PW_PORT_FLAG_BUFFERS (1<<1) /**< port has data */
|
||||
#define PW_PORT_FLAG_CONTROL (1<<2) /**< port has control */
|
||||
uint32_t flags;
|
||||
|
||||
enum pw_direction direction; /**< port direction */
|
||||
uint32_t port_id; /**< port id */
|
||||
|
|
@ -616,7 +622,6 @@ struct pw_control {
|
|||
struct spa_list port_link; /**< link in port control_list */
|
||||
|
||||
enum spa_direction direction; /**< the direction */
|
||||
struct spa_pod *param; /**< control params */
|
||||
|
||||
struct pw_control *output; /**< pointer to linked output control */
|
||||
|
||||
|
|
@ -757,7 +762,7 @@ int pw_link_deactivate(struct pw_link *link);
|
|||
struct pw_control *
|
||||
pw_control_new(struct pw_core *core,
|
||||
struct pw_port *owner, /**< can be NULL */
|
||||
const struct spa_pod *param, /**< copy is taken */
|
||||
uint32_t id, uint32_t size,
|
||||
size_t user_data_size /**< extra user data */);
|
||||
|
||||
void pw_control_destroy(struct pw_control *control);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue