mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-15 08:56:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: Clean up some of the param handling

Browse source
This commit is contained in:
Wim Taymans 2021-05-21 10:01:37 +02:00
parent 079b90bde5
commit 89c10dad70
4 changed files with 78 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

13
spa/plugins/audioconvert/audioadapter.c
View file

@ -83,9 +83,10 @@ struct impl {
#define IDX_Format 3 #define IDX_Format 3
#define IDX_EnumPortConfig 4 #define IDX_EnumPortConfig 4
#define IDX_PortConfig 5 #define IDX_PortConfig 5
struct spa_param_info params[6]; #define N_NODE_PARAMS 6
uint32_t convert_params_flags[6]; struct spa_param_info params[N_NODE_PARAMS];
uint32_t follower_params_flags[6]; uint32_t convert_params_flags[N_NODE_PARAMS];
uint32_t follower_params_flags[N_NODE_PARAMS];
struct spa_hook_list hooks; struct spa_hook_list hooks;
struct spa_callbacks callbacks; struct spa_callbacks callbacks;
@ -221,7 +222,7 @@ static void emit_node_info(struct impl *this, bool full)
this->info.change_mask = this->info_all; this->info.change_mask = this->info_all;
if (this->info.change_mask) { if (this->info.change_mask) {
if (this->info.change_mask & SPA_NODE_CHANGE_MASK_PARAMS) { if (this->info.change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {
for (i = 0; i < SPA_N_ELEMENTS(this->params); i++) { for (i = 0; i < this->info.n_params; i++) {
if (this->params[i].user > 0) { if (this->params[i].user > 0) {
this->params[i].flags ^= SPA_PARAM_INFO_SERIAL; this->params[i].flags ^= SPA_PARAM_INFO_SERIAL;
this->params[i].user = 0; this->params[i].user = 0;
@ -735,12 +736,12 @@ static void follower_port_info(void *data,
this->follower_params_flags[idx] == info->params[i].flags) this->follower_params_flags[idx] == info->params[i].flags)
continue; continue;
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->follower_params_flags[idx] = info->params[i].flags; this->follower_params_flags[idx] = info->params[i].flags;
this->params[idx].flags = this->params[idx].flags =
(this->params[idx].flags & SPA_PARAM_INFO_SERIAL) | (this->params[idx].flags & SPA_PARAM_INFO_SERIAL) |
(info->params[i].flags & SPA_PARAM_INFO_READWRITE); (info->params[i].flags & SPA_PARAM_INFO_READWRITE);
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
if (!this->add_listener) if (!this->add_listener)
this->params[idx].user++; this->params[idx].user++;
} }
@ -1220,7 +1221,7 @@ impl_init(const struct spa_handle_factory *factory,
this->params[IDX_EnumPortConfig] = SPA_PARAM_INFO(SPA_PARAM_EnumPortConfig, SPA_PARAM_INFO_READ); this->params[IDX_EnumPortConfig] = SPA_PARAM_INFO(SPA_PARAM_EnumPortConfig, SPA_PARAM_INFO_READ);
this->params[IDX_PortConfig] = SPA_PARAM_INFO(SPA_PARAM_PortConfig, SPA_PARAM_INFO_READWRITE); this->params[IDX_PortConfig] = SPA_PARAM_INFO(SPA_PARAM_PortConfig, SPA_PARAM_INFO_READWRITE);
this->info.params = this->params; this->info.params = this->params;
this->info.n_params = 6; this->info.n_params = N_NODE_PARAMS;
spa_node_add_listener(this->follower, spa_node_add_listener(this->follower,
&this->follower_listener, &follower_node_events, this); &this->follower_listener, &follower_node_events, this);

14
spa/plugins/audioconvert/audioconvert.c
View file

@ -1040,11 +1040,15 @@ impl_node_port_set_param(void *object,
spa_log_debug(this->log, NAME " %p: set param %u on port %d:%d %p", spa_log_debug(this->log, NAME " %p: set param %u on port %d:%d %p",
this, id, direction, port_id, param); this, id, direction, port_id, param);
is_monitor = IS_MONITOR_PORT(this, direction, port_id); switch (id) {
if (is_monitor) default:
target = this->fmt[SPA_DIRECTION_INPUT]; is_monitor = IS_MONITOR_PORT(this, direction, port_id);
else if (is_monitor)
target = this->fmt[direction]; target = this->fmt[SPA_DIRECTION_INPUT];
else
target = this->fmt[direction];
break;
}
if ((res = spa_node_port_set_param(target, if ((res = spa_node_port_set_param(target,
direction, port_id, id, flags, param)) < 0) direction, port_id, id, flags, param)) < 0)

58
spa/plugins/audioconvert/merger.c
View file

@ -114,7 +114,13 @@ struct port {
uint64_t info_all; uint64_t info_all;
struct spa_port_info info; struct spa_port_info info;
struct spa_param_info params[8]; #define IDX_EnumFormat 0
#define IDX_Meta 1
#define IDX_IO 2
#define IDX_Format 3
#define IDX_Buffers 4
#define N_PORT_PARAMS 5
struct spa_param_info params[N_PORT_PARAMS];
char position[16]; char position[16];
struct spa_audio_info format; struct spa_audio_info format;
@ -140,7 +146,11 @@ struct impl {
uint64_t info_all; uint64_t info_all;
struct spa_node_info info; struct spa_node_info info;
struct spa_param_info params[8]; #define IDX_PortConfig 0
#define IDX_PropInfo 1
#define IDX_Props 2
#define N_NODE_PARAMS 3
struct spa_param_info params[N_NODE_PARAMS];
struct spa_hook_list hooks; struct spa_hook_list hooks;
@ -232,13 +242,13 @@ static int init_port(struct impl *this, enum spa_direction direction, uint32_t p
port->info = SPA_PORT_INFO_INIT(); port->info = SPA_PORT_INFO_INIT();
port->info.flags = SPA_PORT_FLAG_NO_REF | port->info.flags = SPA_PORT_FLAG_NO_REF |
SPA_PORT_FLAG_DYNAMIC_DATA; SPA_PORT_FLAG_DYNAMIC_DATA;
port->params[0] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ); port->params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
port->params[1] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ); port->params[IDX_Meta] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
port->params[2] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ); port->params[IDX_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
port->params[3] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE); port->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
port->params[4] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0); port->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
port->info.params = port->params; port->info.params = port->params;
port->info.n_params = 5; port->info.n_params = N_PORT_PARAMS;
port->n_buffers = 0; port->n_buffers = 0;
port->have_format = false; port->have_format = false;
@ -565,14 +575,14 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
port->have_format = true; port->have_format = true;
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS; this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->params[2].flags ^= SPA_PARAM_INFO_SERIAL; this->params[IDX_Props].flags ^= SPA_PARAM_INFO_SERIAL;
emit_node_info(this, false); emit_node_info(this, false);
return 0; return 0;
} }
case SPA_PARAM_Props: case SPA_PARAM_Props:
if (apply_props(this, param) > 0) { if (apply_props(this, param) > 0) {
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS; this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->params[2].flags ^= SPA_PARAM_INFO_SERIAL; this->params[IDX_Props].flags ^= SPA_PARAM_INFO_SERIAL;
emit_node_info(this, false); emit_node_info(this, false);
} }
break; break;
@ -980,11 +990,11 @@ static int port_set_format(void *object,
port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS; port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
if (port->have_format) { if (port->have_format) {
port->params[3] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE); port->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE);
port->params[4] = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ); port->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ);
} else { } else {
port->params[3] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE); port->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
port->params[4] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0); port->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
} }
emit_port_info(this, port, false); emit_port_info(this, port, false);
@ -1401,11 +1411,11 @@ impl_init(const struct spa_handle_factory *factory,
this->info.max_output_ports = MAX_PORTS+1; this->info.max_output_ports = MAX_PORTS+1;
this->info.flags = SPA_NODE_FLAG_RT | this->info.flags = SPA_NODE_FLAG_RT |
SPA_NODE_FLAG_IN_PORT_CONFIG; SPA_NODE_FLAG_IN_PORT_CONFIG;
this->params[0] = SPA_PARAM_INFO(SPA_PARAM_PortConfig, SPA_PARAM_INFO_WRITE); this->params[IDX_PortConfig] = SPA_PARAM_INFO(SPA_PARAM_PortConfig, SPA_PARAM_INFO_WRITE);
this->params[1] = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ); this->params[IDX_PropInfo] = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
this->params[2] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE); this->params[IDX_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
this->info.params = this->params; this->info.params = this->params;
this->info.n_params = 3; this->info.n_params = N_NODE_PARAMS;
port = GET_OUT_PORT(this, 0); port = GET_OUT_PORT(this, 0);
port->direction = SPA_DIRECTION_OUTPUT; port->direction = SPA_DIRECTION_OUTPUT;
@ -1414,13 +1424,13 @@ impl_init(const struct spa_handle_factory *factory,
SPA_PORT_CHANGE_MASK_PARAMS; SPA_PORT_CHANGE_MASK_PARAMS;
port->info = SPA_PORT_INFO_INIT(); port->info = SPA_PORT_INFO_INIT();
port->info.flags = SPA_PORT_FLAG_DYNAMIC_DATA; port->info.flags = SPA_PORT_FLAG_DYNAMIC_DATA;
port->params[0] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ); port->params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
port->params[1] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ); port->params[IDX_Meta] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
port->params[2] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ); port->params[IDX_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
port->params[3] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE); port->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
port->params[4] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0); port->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
port->info.params = port->params; port->info.params = port->params;
port->info.n_params = 5; port->info.n_params = N_PORT_PARAMS;
spa_list_init(&port->queue); spa_list_init(&port->queue);
this->volume.cpu_flags = this->cpu_flags; this->volume.cpu_flags = this->cpu_flags;

48
spa/plugins/audioconvert/splitter.c
View file

@ -73,7 +73,13 @@ struct port {
uint64_t info_all; uint64_t info_all;
struct spa_port_info info; struct spa_port_info info;
struct spa_param_info params[8]; #define IDX_EnumFormat 0
#define IDX_Meta 1
#define IDX_IO 2
#define IDX_Format 3
#define IDX_Buffers 4
#define N_PORT_PARAMS 5
struct spa_param_info params[N_PORT_PARAMS];
struct spa_dict info_props; struct spa_dict info_props;
struct spa_dict_item info_props_items[2]; struct spa_dict_item info_props_items[2];
@ -101,7 +107,9 @@ struct impl {
uint64_t info_all; uint64_t info_all;
struct spa_node_info info; struct spa_node_info info;
struct spa_param_info params[8]; #define IDX_PortConfig 0
#define N_NODE_PARAMS 1
struct spa_param_info params[N_NODE_PARAMS];
struct spa_hook_list hooks; struct spa_hook_list hooks;
@ -178,13 +186,13 @@ static int init_port(struct impl *this, enum spa_direction direction,
port->info_props_items[1] = SPA_DICT_ITEM_INIT(SPA_KEY_AUDIO_CHANNEL, port->position); port->info_props_items[1] = SPA_DICT_ITEM_INIT(SPA_KEY_AUDIO_CHANNEL, port->position);
port->info_props = SPA_DICT_INIT(port->info_props_items, 2); port->info_props = SPA_DICT_INIT(port->info_props_items, 2);
port->info.props = &port->info_props; port->info.props = &port->info_props;
port->params[0] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ); port->params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
port->params[1] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ); port->params[IDX_Meta] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
port->params[2] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ); port->params[IDX_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
port->params[3] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE); port->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
port->params[4] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0); port->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
port->info.params = port->params; port->info.params = port->params;
port->info.n_params = 5; port->info.n_params = N_PORT_PARAMS;
spa_list_init(&port->queue); spa_list_init(&port->queue);
@ -727,11 +735,11 @@ static int port_set_format(void *object,
} }
port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS; port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
if (port->have_format) { if (port->have_format) {
port->params[3] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE); port->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READWRITE);
port->params[4] = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ); port->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, SPA_PARAM_INFO_READ);
} else { } else {
port->params[3] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE); port->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
port->params[4] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0); port->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
} }
emit_port_info(this, port, false); emit_port_info(this, port, false);
@ -1075,9 +1083,9 @@ impl_init(const struct spa_handle_factory *factory,
this->info.max_output_ports = MAX_PORTS; this->info.max_output_ports = MAX_PORTS;
this->info.flags = SPA_NODE_FLAG_RT | this->info.flags = SPA_NODE_FLAG_RT |
SPA_NODE_FLAG_OUT_PORT_CONFIG; SPA_NODE_FLAG_OUT_PORT_CONFIG;
this->params[0] = SPA_PARAM_INFO(SPA_PARAM_PortConfig, SPA_PARAM_INFO_WRITE); this->params[IDX_PortConfig] = SPA_PARAM_INFO(SPA_PARAM_PortConfig, SPA_PARAM_INFO_WRITE);
this->info.params = this->params; this->info.params = this->params;
this->info.n_params = 1; this->info.n_params = N_NODE_PARAMS;
port = GET_IN_PORT(this, 0); port = GET_IN_PORT(this, 0);
port->info_all = SPA_PORT_CHANGE_MASK_FLAGS | port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |
@ -1087,13 +1095,13 @@ impl_init(const struct spa_handle_factory *factory,
port->info = SPA_PORT_INFO_INIT(); port->info = SPA_PORT_INFO_INIT();
port->info.flags = SPA_PORT_FLAG_NO_REF | port->info.flags = SPA_PORT_FLAG_NO_REF |
SPA_PORT_FLAG_DYNAMIC_DATA; SPA_PORT_FLAG_DYNAMIC_DATA;
port->params[0] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ); port->params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
port->params[1] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ); port->params[IDX_Meta] = SPA_PARAM_INFO(SPA_PARAM_Meta, SPA_PARAM_INFO_READ);
port->params[2] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ); port->params[IDX_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
port->params[3] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE); port->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
port->params[4] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0); port->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
port->info.params = port->params; port->info.params = port->params;
port->info.n_params = 5; port->info.n_params = N_PORT_PARAMS;
return 0; return 0;
} }