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

stream: clean up the params

Browse source 
Use defines for the param index.
Fix params for filter. Make it possible to use Props params.
This commit is contained in:
Wim Taymans 2021-05-21 10:45:19 +02:00
parent 89c10dad70
commit 36000ea508
2 changed files with 59 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/pipewire/filter.c
View file

@ -100,7 +100,13 @@ struct port {
uint32_t change_mask_all; uint32_t change_mask_all;
struct spa_port_info info; struct spa_port_info info;
struct spa_list param_list; struct spa_list param_list;
struct spa_param_info params[5]; #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_io_buffers *io; struct spa_io_buffers *io;
@ -138,7 +144,9 @@ struct filter {
uint32_t change_mask_all; uint32_t change_mask_all;
struct spa_node_info info; struct spa_node_info info;
struct spa_list param_list; struct spa_list param_list;
struct spa_param_info params[1]; #define IDX_Props 0
#define N_NODE_PARAMS 1
struct spa_param_info params[N_NODE_PARAMS];
struct data data; struct data data;
uintptr_t seq; uintptr_t seq;
@ -156,18 +164,28 @@ struct filter {
}; };
static int get_param_index(uint32_t id) static int get_param_index(uint32_t id)
{
switch (id) {
case SPA_PARAM_Props:
return IDX_Props;
default:
return -1;
}
}
static int get_port_param_index(uint32_t id)
{ {
switch (id) { switch (id) {
case SPA_PARAM_EnumFormat: case SPA_PARAM_EnumFormat:
return 0; return IDX_EnumFormat;
case SPA_PARAM_Meta: case SPA_PARAM_Meta:
return 1; return IDX_Meta;
case SPA_PARAM_IO: case SPA_PARAM_IO:
return 2; return IDX_IO;
case SPA_PARAM_Format: case SPA_PARAM_Format:
return 3; return IDX_Format;
case SPA_PARAM_Buffers: case SPA_PARAM_Buffers:
return 4; return IDX_Buffers;
default: default:
return -1; return -1;
} }
@ -218,9 +236,8 @@ static struct param *add_param(struct filter *impl, struct port *port,
memcpy(p->param, param, SPA_POD_SIZE(param)); memcpy(p->param, param, SPA_POD_SIZE(param));
SPA_POD_OBJECT_ID(p->param) = id; SPA_POD_OBJECT_ID(p->param) = id;
idx = get_param_index(id);
if (port) { if (port) {
idx = get_port_param_index(id);
spa_list_append(&port->param_list, &p->link); spa_list_append(&port->param_list, &p->link);
if (idx != -1) { if (idx != -1) {
port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS; port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
@ -228,6 +245,7 @@ static struct param *add_param(struct filter *impl, struct port *port,
port->params[idx].flags ^= SPA_PARAM_INFO_SERIAL; port->params[idx].flags ^= SPA_PARAM_INFO_SERIAL;
} }
} else { } else {
idx = get_param_index(id);
spa_list_append(&impl->param_list, &p->link); spa_list_append(&impl->param_list, &p->link);
if (idx != -1) { if (idx != -1) {
impl->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS; impl->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
@ -1265,9 +1283,9 @@ pw_filter_connect(struct pw_filter *filter,
impl->info.max_output_ports = MAX_PORTS; impl->info.max_output_ports = MAX_PORTS;
impl->info.flags = impl->process_rt ? SPA_NODE_FLAG_RT : 0; impl->info.flags = impl->process_rt ? SPA_NODE_FLAG_RT : 0;
impl->info.props = &filter->properties->dict; impl->info.props = &filter->properties->dict;
impl->params[0] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_WRITE); impl->params[IDX_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_WRITE);
impl->info.params = impl->params; impl->info.params = impl->params;
impl->info.n_params = SPA_N_ELEMENTS(impl->params); impl->info.n_params = N_NODE_PARAMS;
impl->info.change_mask = impl->change_mask_all; impl->info.change_mask = impl->change_mask_all;
clear_params(impl, NULL, SPA_ID_INVALID); clear_params(impl, NULL, SPA_ID_INVALID);
@ -1455,13 +1473,13 @@ void *pw_filter_add_port(struct pw_filter *filter,
p->info.flags |= SPA_PORT_FLAG_CAN_ALLOC_BUFFERS; p->info.flags |= SPA_PORT_FLAG_CAN_ALLOC_BUFFERS;
p->info.props = &p->props->dict; p->info.props = &p->props->dict;
p->change_mask_all |= SPA_PORT_CHANGE_MASK_PARAMS; p->change_mask_all |= SPA_PORT_CHANGE_MASK_PARAMS;
p->params[0] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ); p->params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
p->params[1] = SPA_PARAM_INFO(SPA_PARAM_Meta, 0); p->params[IDX_Meta] = SPA_PARAM_INFO(SPA_PARAM_Meta, 0);
p->params[2] = SPA_PARAM_INFO(SPA_PARAM_IO, 0); p->params[IDX_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, 0);
p->params[3] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE); p->params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
p->params[4] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0); p->params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
p->info.params = p->params; p->info.params = p->params;
p->info.n_params = 5; p->info.n_params = N_PORT_PARAMS;
emit_port_info(impl, p, true); emit_port_info(impl, p, true);

40
src/pipewire/stream.c
View file

@ -121,13 +121,21 @@ struct stream {
uint32_t port_change_mask_all; uint32_t port_change_mask_all;
struct spa_port_info port_info; struct spa_port_info port_info;
struct pw_properties *port_props; struct pw_properties *port_props;
struct spa_param_info port_params[5]; #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 port_params[N_PORT_PARAMS];
struct spa_list param_list; struct spa_list param_list;
uint32_t change_mask_all; uint32_t change_mask_all;
struct spa_node_info info; struct spa_node_info info;
struct spa_param_info params[1]; #define IDX_Props 0
#define N_NODE_PARAMS 1
struct spa_param_info params[N_NODE_PARAMS];
uint32_t media_type; uint32_t media_type;
uint32_t media_subtype; uint32_t media_subtype;
@ -157,7 +165,7 @@ static int get_param_index(uint32_t id)
{ {
switch (id) { switch (id) {
case SPA_PARAM_Props: case SPA_PARAM_Props:
return 0; return IDX_Props;
default: default:
return -1; return -1;
} }
@ -167,15 +175,15 @@ static int get_port_param_index(uint32_t id)
{ {
switch (id) { switch (id) {
case SPA_PARAM_EnumFormat: case SPA_PARAM_EnumFormat:
return 0; return IDX_EnumFormat;
case SPA_PARAM_Meta: case SPA_PARAM_Meta:
return 1; return IDX_Meta;
case SPA_PARAM_IO: case SPA_PARAM_IO:
return 2; return IDX_IO;
case SPA_PARAM_Format: case SPA_PARAM_Format:
return 3; return IDX_Format;
case SPA_PARAM_Buffers: case SPA_PARAM_Buffers:
return 4; return IDX_Buffers;
default: default:
return -1; return -1;
} }
@ -1581,9 +1589,9 @@ pw_stream_connect(struct pw_stream *stream,
if (!impl->process_rt) if (!impl->process_rt)
impl->info.flags |= SPA_NODE_FLAG_ASYNC; impl->info.flags |= SPA_NODE_FLAG_ASYNC;
impl->info.props = &stream->properties->dict; impl->info.props = &stream->properties->dict;
impl->params[0] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_WRITE); impl->params[IDX_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_WRITE);
impl->info.params = impl->params; impl->info.params = impl->params;
impl->info.n_params = 1; impl->info.n_params = N_NODE_PARAMS;
impl->info.change_mask = impl->change_mask_all; impl->info.change_mask = impl->change_mask_all;
impl->port_change_mask_all = impl->port_change_mask_all =
@ -1596,14 +1604,14 @@ pw_stream_connect(struct pw_stream *stream,
impl->port_info.flags = 0; impl->port_info.flags = 0;
if (SPA_FLAG_IS_SET(flags, PW_STREAM_FLAG_ALLOC_BUFFERS)) if (SPA_FLAG_IS_SET(flags, PW_STREAM_FLAG_ALLOC_BUFFERS))
impl->port_info.flags |= SPA_PORT_FLAG_CAN_ALLOC_BUFFERS; impl->port_info.flags |= SPA_PORT_FLAG_CAN_ALLOC_BUFFERS;
impl->port_params[0] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, 0); impl->port_params[IDX_EnumFormat] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, 0);
impl->port_params[1] = SPA_PARAM_INFO(SPA_PARAM_Meta, 0); impl->port_params[IDX_Meta] = SPA_PARAM_INFO(SPA_PARAM_Meta, 0);
impl->port_params[2] = SPA_PARAM_INFO(SPA_PARAM_IO, 0); impl->port_params[IDX_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, 0);
impl->port_params[3] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE); impl->port_params[IDX_Format] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_WRITE);
impl->port_params[4] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0); impl->port_params[IDX_Buffers] = SPA_PARAM_INFO(SPA_PARAM_Buffers, 0);
impl->port_info.props = &impl->port_props->dict; impl->port_info.props = &impl->port_props->dict;
impl->port_info.params = impl->port_params; impl->port_info.params = impl->port_params;
impl->port_info.n_params = 5; impl->port_info.n_params = N_PORT_PARAMS;
clear_params(impl, SPA_ID_INVALID); clear_params(impl, SPA_ID_INVALID);
for (i = 0; i < n_params; i++) for (i = 0; i < n_params; i++)