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

Improve enum_param

Browse source 
Add an argument to pass the result param to the caller instead of
having the caller have to pick it up from the builder.
Improve docs for node, clock and monitor
Pass spa_pod everywhere instead of spa_pod_object.
Pass result argument to spa_pod_filter to make things a little
nicer.
This commit is contained in:
Wim Taymans 2017-11-13 17:57:38 +01:00
parent cd5e697e9f
commit 440f681f4b
70 changed files with 872 additions and 858 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,7 +79,7 @@ struct proxy_port {
bool have_format;
uint32_t n_params;
struct spa_pod_object **params;
struct spa_pod **params;
struct spa_port_io *io;
uint32_t n_buffers;
@ -111,7 +111,7 @@ struct proxy {
struct proxy_port out_ports[MAX_OUTPUTS];
uint32_t n_params;
struct spa_pod_object **params;
struct spa_pod **params;
uint8_t format_buffer[1024];
uint32_t seq;
@ -152,7 +152,8 @@ static int clear_buffers(struct proxy *this, struct proxy_port *port)
static int spa_proxy_node_enum_params(struct spa_node *node,
uint32_t id, uint32_t *index,
const struct spa_pod_object *filter,
const struct spa_pod *filter,
struct spa_pod **result,
struct spa_pod_builder *builder)
{
struct proxy *this;
@ -167,17 +168,17 @@ static int spa_proxy_node_enum_params(struct spa_node *node,
spa_pod_builder_get_state(builder, &state);
while (true) {
struct spa_pod_object *param;
struct spa_pod *param;
if (*index >= this->n_params)
return 0;
param = this->params[(*index)++];
if (param->body.id != id)
if (!spa_pod_is_object_id(param, id))
continue;
if (spa_pod_filter(builder, &param->pod, &filter->pod) == 0)
if (spa_pod_filter(builder, result, param, filter) == 0)
break;
spa_pod_builder_reset(builder, &state);
@ -186,7 +187,7 @@ static int spa_proxy_node_enum_params(struct spa_node *node,
}
static int spa_proxy_node_set_param(struct spa_node *node, uint32_t id, uint32_t flags,
const struct spa_pod_object *param)
const struct spa_pod *param)
{
struct proxy *this;
@ -316,7 +317,7 @@ do_update_port(struct proxy *this,
uint32_t port_id,
uint32_t change_mask,
uint32_t n_params,
const struct spa_pod_object **params,
const struct spa_pod **params,
const struct spa_port_info *info)
{
struct proxy_port *port;
@ -333,11 +334,11 @@ do_update_port(struct proxy *this,
for (i = 0; i < port->n_params; i++)
free(port->params[i]);
port->n_params = n_params;
port->params = realloc(port->params, port->n_params * sizeof(struct spa_pod_object *));
port->params = realloc(port->params, port->n_params * sizeof(struct spa_pod *));
for (i = 0; i < port->n_params; i++) {
port->params[i] = spa_pod_object_copy(params[i]);
if (port->params[i]->body.id == t->param.idFormat)
port->params[i] = pw_spa_pod_copy(params[i]);
if (spa_pod_is_object_id(port->params[i], t->param.idFormat))
port->have_format = true;
}
@ -451,7 +452,8 @@ static int
spa_proxy_node_port_enum_params(struct spa_node *node,
enum spa_direction direction, uint32_t port_id,
uint32_t id, uint32_t *index,
const struct spa_pod_object *filter,
const struct spa_pod *filter,
struct spa_pod **result,
struct spa_pod_builder *builder)
{
struct proxy *this;
@ -471,17 +473,17 @@ spa_proxy_node_port_enum_params(struct spa_node *node,
spa_pod_builder_get_state(builder, &state);
while (true) {
struct spa_pod_object *param;
struct spa_pod *param;
if (*index >= port->n_params)
return 0;
param = port->params[(*index)++];
if (param->body.id != id)
if (!spa_pod_is_object_id(param, id))
continue;
if (spa_pod_filter(builder, &param->pod, &filter->pod) == 0)
if (spa_pod_filter(builder, result, param, filter) == 0)
break;
spa_pod_builder_reset(builder, &state);
@ -493,7 +495,7 @@ static int
spa_proxy_node_port_set_param(struct spa_node *node,
enum spa_direction direction, uint32_t port_id,
uint32_t id, uint32_t flags,
const struct spa_pod_object *param)
const struct spa_pod *param)
{
struct proxy *this;
@ -652,7 +654,7 @@ static int
spa_proxy_node_port_alloc_buffers(struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
struct spa_pod_object **params,
struct spa_pod **params,
uint32_t n_params,
struct spa_buffer **buffers,
uint32_t *n_buffers)
@ -845,7 +847,7 @@ client_node_update(void *data,
uint32_t max_input_ports,
uint32_t max_output_ports,
uint32_t n_params,
const struct spa_pod_object **params)
const struct spa_pod **params)
{
struct impl *impl = data;
struct proxy *this = &impl->proxy;
@ -861,10 +863,10 @@ client_node_update(void *data,
for (i = 0; i < this->n_params; i++)
free(this->params[i]);
this->n_params = n_params;
this->params = realloc(this->params, this->n_params * sizeof(struct spa_pod_object *));
this->params = realloc(this->params, this->n_params * sizeof(struct spa_pod *));
for (i = 0; i < this->n_params; i++)
this->params[i] = spa_pod_object_copy(params[i]);
this->params[i] = pw_spa_pod_copy(params[i]);
}
spa_log_info(this->log, "proxy %p: got node update max_in %u, max_out %u", this,
this->max_inputs, this->max_outputs);
@ -876,7 +878,7 @@ client_node_port_update(void *data,
uint32_t port_id,
uint32_t change_mask,
uint32_t n_params,
const struct spa_pod_object **params,
const struct spa_pod **params,
const struct spa_port_info *info)
{
struct impl *impl = data;

20
src/modules/module-client-node/protocol-native.c
View file

@ -53,7 +53,7 @@ client_node_marshal_update(void *object,
uint32_t max_input_ports,
uint32_t max_output_ports,
uint32_t n_params,
const struct spa_pod_object **params)
const struct spa_pod **params)
{
struct pw_proxy *proxy = object;
struct spa_pod_builder *b;
@ -82,7 +82,7 @@ client_node_marshal_port_update(void *object,
uint32_t port_id,
uint32_t change_mask,
uint32_t n_params,
const struct spa_pod_object **params,
const struct spa_pod **params,
const struct spa_port_info *info)
{
struct pw_proxy *proxy = object;
@ -188,7 +188,7 @@ static bool client_node_demarshal_set_param(void *object, void *data, size_t siz
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
uint32_t seq, id, flags;
const struct spa_pod_object *param = NULL;
const struct spa_pod *param = NULL;
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs,
@ -276,7 +276,7 @@ static bool client_node_demarshal_port_set_param(void *object, void *data, size_
struct pw_proxy *proxy = object;
struct spa_pod_parser prs;
uint32_t seq, direction, port_id, id, flags;
const struct spa_pod_object *param = NULL;
const struct spa_pod *param = NULL;
spa_pod_parser_init(&prs, data, size, 0);
if (spa_pod_parser_get(&prs,
@ -432,7 +432,7 @@ static void client_node_marshal_transport(void *object, uint32_t node_id, int re
static void
client_node_marshal_set_param(void *object, uint32_t seq, uint32_t id, uint32_t flags,
const struct spa_pod_object *param)
const struct spa_pod *param)
{
struct pw_resource *resource = object;
struct spa_pod_builder *b;
@ -514,7 +514,7 @@ client_node_marshal_port_set_param(void *object,
uint32_t port_id,
uint32_t id,
uint32_t flags,
const struct spa_pod_object *param)
const struct spa_pod *param)
{
struct pw_resource *resource = object;
struct spa_pod_builder *b;
@ -652,7 +652,7 @@ static bool client_node_demarshal_update(void *object, void *data, size_t size)
struct pw_resource *resource = object;
struct spa_pod_parser prs;
uint32_t change_mask, max_input_ports, max_output_ports, n_params;
const struct spa_pod_object **params;
const struct spa_pod **params;
int i;
spa_pod_parser_init(&prs, data, size, 0);
@ -664,7 +664,7 @@ static bool client_node_demarshal_update(void *object, void *data, size_t size)
"i", &n_params, NULL) < 0)
return false;
params = alloca(n_params * sizeof(struct spa_pod_object *));
params = alloca(n_params * sizeof(struct spa_pod *));
for (i = 0; i < n_params; i++)
if (spa_pod_parser_get(&prs, "O", &params[i], NULL) < 0)
return false;
@ -682,7 +682,7 @@ static bool client_node_demarshal_port_update(void *object, void *data, size_t s
struct pw_resource *resource = object;
struct spa_pod_parser prs;
uint32_t i, direction, port_id, change_mask, n_params;
const struct spa_pod_object **params = NULL;
const struct spa_pod **params = NULL;
struct spa_port_info info, *infop = NULL;
struct spa_pod *ipod;
@ -695,7 +695,7 @@ static bool client_node_demarshal_port_update(void *object, void *data, size_t s
"i", &n_params, NULL) < 0)
return false;
params = alloca(n_params * sizeof(struct spa_pod_object *));
params = alloca(n_params * sizeof(struct spa_pod *));
for (i = 0; i < n_params; i++)
if (spa_pod_parser_get(&prs, "O", &params[i], NULL) < 0)
return false;

2
src/modules/module-flatpak.c
View file

@ -434,7 +434,7 @@ do_create_link(void *data,
uint32_t output_port_id,
uint32_t input_node_id,
uint32_t input_port_id,
const struct spa_pod_object *filter,
const struct spa_pod *filter,
const struct spa_dict *props,
uint32_t new_id)
{

4
src/modules/module-jack.c
View file

@ -1297,6 +1297,7 @@ static bool on_global(void *data, struct pw_global *global)
uint32_t index = 0;
uint8_t buf[2048];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buf, sizeof(buf));
struct spa_pod *props;
if (pw_global_get_type(global) != impl->t->node)
return true;
@ -1328,9 +1329,8 @@ static bool on_global(void *data, struct pw_global *global)
return true;
}
if (spa_node_enum_params(node->node, SPA_ID_INVALID, &index, NULL, &b) == 1) {
if (spa_node_enum_params(node->node, impl->t->param.idProps, &index, NULL, &props, &b) == 1) {
int min_latency = -1;
struct spa_pod_object *props = spa_pod_builder_deref(&b, 0);
spa_pod_object_parse(props,
":", impl->prop_min_latency, "?i", &min_latency, NULL);

24
src/modules/module-jack/jack-node.c
View file

@ -125,7 +125,8 @@ struct port_data {
static int node_enum_params(struct spa_node *node,
uint32_t id, uint32_t *index,
const struct spa_pod_object *filter,
const struct spa_pod *filter,
struct spa_pod **param,
struct spa_pod_builder *builder)
{
return -ENOTSUP;
@ -133,7 +134,7 @@ static int node_enum_params(struct spa_node *node,
static int node_set_param(struct spa_node *node,
uint32_t id, uint32_t flags,
const struct spa_pod_object *param)
const struct spa_pod *param)
{
return -ENOTSUP;
}
@ -395,9 +396,9 @@ static int port_get_info(struct spa_node *node, enum spa_direction direction, ui
static int port_enum_formats(struct spa_node *node,
enum spa_direction direction, uint32_t port_id,
uint32_t *index,
const struct spa_pod_object *filter,
struct spa_pod_builder *builder,
struct spa_pod **param)
const struct spa_pod *filter,
struct spa_pod **param,
struct spa_pod_builder *builder)
{
struct node_data *nd = SPA_CONTAINER_OF(node, struct node_data, node_impl);
struct port_data *pd = nd->port_data[direction][port_id];
@ -441,7 +442,8 @@ static int port_enum_formats(struct spa_node *node,
static int port_enum_params(struct spa_node *node,
enum spa_direction direction, uint32_t port_id,
uint32_t id, uint32_t *index,
const struct spa_pod_object *filter,
const struct spa_pod *filter,
struct spa_pod **result,
struct spa_pod_builder *builder)
{
struct node_data *nd = SPA_CONTAINER_OF(node, struct node_data, node_impl);
@ -454,11 +456,11 @@ static int port_enum_params(struct spa_node *node,
next:
if (id == t->param.idEnumFormat) {
if ((res = port_enum_formats(node, direction, port_id, index, filter, builder, &param)) <= 0)
if ((res = port_enum_formats(node, direction, port_id, index, filter, &param, builder)) <= 0)
return res;
}
else if (id == t->param.idFormat) {
if ((res = port_enum_formats(node, direction, port_id, index, filter, builder, &param)) <= 0)
if ((res = port_enum_formats(node, direction, port_id, index, filter, &param, builder)) <= 0)
return res;
}
else
@ -467,7 +469,7 @@ static int port_enum_params(struct spa_node *node,
(*index)++;
spa_pod_builder_reset(builder, &state);
if ((res = spa_pod_filter(builder, param, (struct spa_pod*)filter)) < 0)
if ((res = spa_pod_filter(builder, result, param, filter)) < 0)
goto next;
return 1;
@ -476,7 +478,7 @@ static int port_enum_params(struct spa_node *node,
static int port_set_param(struct spa_node *node,
enum spa_direction direction, uint32_t port_id,
uint32_t id, uint32_t flags,
const struct spa_pod_object *param)
const struct spa_pod *param)
{
return 0;
}
@ -515,7 +517,7 @@ static int port_use_buffers(struct spa_node *node, enum spa_direction direction,
}
static int port_alloc_buffers(struct spa_node *node, enum spa_direction direction, uint32_t port_id,
struct spa_pod_object **params, uint32_t n_params,
struct spa_pod **params, uint32_t n_params,
struct spa_buffer **buffers, uint32_t *n_buffers)
{
struct node_data *nd = SPA_CONTAINER_OF(node, struct node_data, node_impl);

8
src/modules/module-protocol-native/protocol-native.c
View file

@ -117,7 +117,7 @@ core_marshal_create_link(void *object,
uint32_t output_port_id,
uint32_t input_node_id,
uint32_t input_port_id,
const struct spa_pod_object *filter,
const struct spa_pod *filter,
const struct spa_dict *props,
uint32_t new_id)
{
@ -463,7 +463,7 @@ static bool core_demarshal_create_link(void *object, void *data, size_t size)
struct spa_pod_parser prs;
uint32_t new_id, i;
uint32_t output_node_id, output_port_id, input_node_id, input_port_id;
struct spa_pod_object *filter = NULL;
struct spa_pod *filter = NULL;
struct spa_dict props;
spa_pod_parser_init(&prs, data, size, 0);
@ -751,7 +751,7 @@ static bool node_demarshal_info(void *object, void *data, size_t size)
"i", &info.n_input_params, NULL) < 0)
return false;
info.input_params = alloca(info.n_input_params * sizeof(struct spa_pod_object *));
info.input_params = alloca(info.n_input_params * sizeof(struct spa_pod *));
for (i = 0; i < info.n_input_params; i++)
if (spa_pod_parser_get(&prs, "P", &info.input_params[i], NULL) < 0)
return false;
@ -762,7 +762,7 @@ static bool node_demarshal_info(void *object, void *data, size_t size)
"i", &info.n_output_params, NULL) < 0)
return false;
info.output_params = alloca(info.n_output_params * sizeof(struct spa_pod_object *));
info.output_params = alloca(info.n_output_params * sizeof(struct spa_pod *));
for (i = 0; i < info.n_output_params; i++)
if (spa_pod_parser_get(&prs, "P", &info.output_params[i], NULL) < 0)
return false;

22
src/modules/spa/spa-monitor.c
View file

@ -57,7 +57,7 @@ struct impl {
struct spa_list item_list;
};
static void add_item(struct pw_spa_monitor *this, struct spa_monitor_item *item)
static void add_item(struct pw_spa_monitor *this, struct spa_pod *item)
{
struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
int res;
@ -72,7 +72,7 @@ static void add_item(struct pw_spa_monitor *this, struct spa_monitor_item *item)
const struct spa_support *support;
uint32_t n_support;
if (spa_pod_object_parse(&item->object,
if (spa_pod_object_parse(item,
":",t->monitor.name, "s", &name,
":",t->monitor.id, "s", &id,
":",t->monitor.klass, "s", &klass,
@ -147,14 +147,14 @@ void destroy_item(struct monitor_item *mitem)
free(mitem);
}
static void remove_item(struct pw_spa_monitor *this, struct spa_monitor_item *item)
static void remove_item(struct pw_spa_monitor *this, struct spa_pod *item)
{
struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
struct monitor_item *mitem;
const char *name, *id;
struct pw_type *t = pw_core_get_type(impl->core);
if (spa_pod_object_parse(&item->object,
if (spa_pod_object_parse(item,
":",t->monitor.name, "s", &name,
":",t->monitor.id, "s", &id, NULL) < 0)
return;
@ -172,16 +172,16 @@ static void on_monitor_event(void *data, struct spa_event *event)
struct pw_type *t = pw_core_get_type(impl->core);
if (SPA_EVENT_TYPE(event) == t->monitor.Added) {
struct spa_monitor_item *item = SPA_POD_CONTENTS(struct spa_event, event);
struct spa_pod *item = SPA_POD_CONTENTS(struct spa_event, event);
add_item(this, item);
} else if (SPA_EVENT_TYPE(event) == t->monitor.Removed) {
struct spa_monitor_item *item = SPA_POD_CONTENTS(struct spa_event, event);
struct spa_pod *item = SPA_POD_CONTENTS(struct spa_event, event);
remove_item(this, item);
} else if (SPA_EVENT_TYPE(event) == t->monitor.Changed) {
struct spa_monitor_item *item = SPA_POD_CONTENTS(struct spa_event, event);
struct spa_pod *item = SPA_POD_CONTENTS(struct spa_event, event);
const char *name;
if (spa_pod_object_parse(&item->object,
if (spa_pod_object_parse(item,
":",t->monitor.name, "s", &name, NULL) < 0)
return;
@ -295,10 +295,12 @@ struct pw_spa_monitor *pw_spa_monitor_load(struct pw_core *core,
spa_list_init(&impl->item_list);
for (index = 0;;) {
struct spa_monitor_item *item;
struct spa_pod *item;
uint8_t buffer[4096];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
int res;
if ((res = spa_monitor_enum_items(this->monitor, &item, &index)) <= 0) {
if ((res = spa_monitor_enum_items(this->monitor, &index, &item, &b)) <= 0) {
if (res != 0)
pw_log_debug("spa_monitor_enum_items: %s\n", spa_strerror(res));
break;

7
src/modules/spa/spa-node.c
View file

@ -155,7 +155,7 @@ static int
setup_props(struct pw_core *core, struct spa_node *spa_node, struct pw_properties *pw_props)
{
int res;
struct spa_pod_object *props;
struct spa_pod *props;
void *state = NULL;
const char *key;
struct pw_type *t = pw_core_get_type(core);
@ -163,11 +163,10 @@ setup_props(struct pw_core *core, struct spa_node *spa_node, struct pw_propertie
uint8_t buf[2048];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buf, sizeof(buf));
if ((res = spa_node_enum_params(spa_node, t->param.idProps, &index, NULL, &b)) <= 0) {
if ((res = spa_node_enum_params(spa_node, t->param.idProps, &index, NULL, &props, &b)) <= 0) {
pw_log_debug("spa_node_get_props failed: %d", res);
return res;
}
props = spa_pod_builder_deref(&b, 0);
while ((key = pw_properties_iterate(pw_props, &state))) {
struct spa_pod_prop *prop;
@ -180,7 +179,7 @@ setup_props(struct pw_core *core, struct spa_node *spa_node, struct pw_propertie
if (id == SPA_ID_INVALID)
continue;
if ((prop = spa_pod_object_find_prop(props, id))) {
if ((prop = spa_pod_find_prop(props, id))) {
const char *value = pw_properties_get(pw_props, key);
pw_log_info("configure prop %s", key);