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

slave -> follower

Browse source 
We use master/follower terminology everywhere.
This commit is contained in:
Wim Taymans 2020-02-21 10:47:32 +01:00
parent bdeeebfdd4
commit a528189d26
22 changed files with 301 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/module-adapter.c
View file

@ -64,7 +64,7 @@ struct node_data {
struct factory_data *data;
struct spa_list link;
struct pw_impl_node *adapter;
struct pw_impl_node *slave;
struct pw_impl_node *follower;
struct spa_hook adapter_listener;
struct pw_resource *resource;
struct spa_hook resource_listener;
@ -95,7 +95,7 @@ static void node_destroy(void *data)
static void node_free(void *data)
{
struct node_data *nd = data;
pw_impl_node_destroy(nd->slave);
pw_impl_node_destroy(nd->follower);
}
static void node_initialized(void *data)
@ -145,7 +145,7 @@ static void *create_object(void *_data,
{
struct factory_data *d = _data;
struct pw_impl_client *client;
struct pw_impl_node *adapter, *slave;
struct pw_impl_node *adapter, *follower;
const char *str, *factory_name;
int res;
struct node_data *nd;
@ -163,30 +163,30 @@ static void *create_object(void *_data,
pw_impl_client_get_info(client)->id);
}
slave = NULL;
str = pw_properties_get(properties, "adapt.slave.node");
follower = NULL;
str = pw_properties_get(properties, "adapt.follower.node");
if (str != NULL) {
if (sscanf(str, "pointer:%p", &slave) != 1)
if (sscanf(str, "pointer:%p", &follower) != 1)
goto error_properties;
pw_properties_setf(properties, "audio.adapt.slave", "pointer:%p", slave);
pw_properties_setf(properties, "audio.adapt.follower", "pointer:%p", follower);
}
if (slave == NULL) {
if (follower == NULL) {
factory_name = pw_properties_get(properties, SPA_KEY_FACTORY_NAME);
if (factory_name == NULL)
goto error_properties;
slave = pw_spa_node_load(d->context,
follower = pw_spa_node_load(d->context,
factory_name,
PW_SPA_NODE_FLAG_ACTIVATE |
PW_SPA_NODE_FLAG_NO_REGISTER,
pw_properties_copy(properties), 0);
if (slave == NULL)
if (follower == NULL)
goto error_no_mem;
}
adapter = pw_adapter_new(pw_impl_module_get_context(d->module),
slave,
follower,
properties,
sizeof(struct node_data));
properties = NULL;
@ -201,7 +201,7 @@ static void *create_object(void *_data,
nd = pw_adapter_get_user_data(adapter);
nd->data = d;
nd->adapter = adapter;
nd->slave = slave;
nd->follower = follower;
nd->resource = resource;
nd->new_id = new_id;
spa_list_append(&d->node_list, &nd->link);

20
src/modules/module-adapter/adapter.c
View file

@ -60,7 +60,7 @@ struct node {
struct pw_impl_node *node;
struct spa_hook node_listener;
struct pw_impl_node *slave;
struct pw_impl_node *follower;
void *user_data;
enum pw_direction direction;
@ -186,7 +186,7 @@ static int find_format(struct pw_impl_node *node, enum pw_direction direction,
struct pw_impl_node *pw_adapter_new(struct pw_context *context,
struct pw_impl_node *slave,
struct pw_impl_node *follower,
struct pw_properties *props,
size_t user_data_size)
{
@ -198,13 +198,13 @@ struct pw_impl_node *pw_adapter_new(struct pw_context *context,
int res;
uint32_t media_type, media_subtype;
info = pw_impl_node_get_info(slave);
info = pw_impl_node_get_info(follower);
if (info == NULL) {
res = -EINVAL;
goto error;
}
pw_log_debug(NAME " %p: in %d/%d out %d/%d", slave,
pw_log_debug(NAME " %p: in %d/%d out %d/%d", follower,
info->n_input_ports, info->max_input_ports,
info->n_output_ports, info->max_output_ports);
@ -231,12 +231,12 @@ struct pw_impl_node *pw_adapter_new(struct pw_context *context,
pw_properties_set(props, "factory.mode", str);
}
if ((res = find_format(slave, direction, &media_type, &media_subtype)) < 0)
if ((res = find_format(follower, direction, &media_type, &media_subtype)) < 0)
goto error;
if (media_type == SPA_MEDIA_TYPE_audio) {
pw_properties_setf(props, "audio.adapt.slave", "pointer:%p",
pw_impl_node_get_implementation(slave));
pw_properties_setf(props, "audio.adapt.follower", "pointer:%p",
pw_impl_node_get_implementation(follower));
pw_properties_set(props, SPA_KEY_LIBRARY_NAME, "audioconvert/libspa-audioconvert");
if (pw_properties_get(props, PW_KEY_MEDIA_CLASS) == NULL)
pw_properties_setf(props, PW_KEY_MEDIA_CLASS, "Audio/%s",
@ -244,8 +244,8 @@ struct pw_impl_node *pw_adapter_new(struct pw_context *context,
factory_name = SPA_NAME_AUDIO_ADAPT;
}
else if (media_type == SPA_MEDIA_TYPE_video) {
pw_properties_setf(props, "video.adapt.slave", "pointer:%p",
pw_impl_node_get_implementation(slave));
pw_properties_setf(props, "video.adapt.follower", "pointer:%p",
pw_impl_node_get_implementation(follower));
pw_properties_set(props, SPA_KEY_LIBRARY_NAME, "videoconvert/libspa-videoconvert");
if (pw_properties_get(props, PW_KEY_MEDIA_CLASS) == NULL)
pw_properties_setf(props, PW_KEY_MEDIA_CLASS, "Video/%s",
@ -270,7 +270,7 @@ struct pw_impl_node *pw_adapter_new(struct pw_context *context,
n = pw_spa_node_get_user_data(node);
n->context = context;
n->node = node;
n->slave = slave;
n->follower = follower;
n->direction = direction;
n->props = props;
n->media_type = media_type;

2
src/modules/module-adapter/adapter.h
View file

@ -35,7 +35,7 @@ extern "C" {
struct pw_impl_node *
pw_adapter_new(struct pw_context *context,
struct pw_impl_node *slave,
struct pw_impl_node *follower,
struct pw_properties *properties,
size_t user_data_size);

38
src/pipewire/context.c
View file

@ -729,12 +729,12 @@ static int collect_nodes(struct pw_impl_node *driver)
uint32_t min_quantum = 0;
uint32_t quantum;
spa_list_consume(t, &driver->slave_list, slave_link) {
spa_list_remove(&t->slave_link);
spa_list_init(&t->slave_link);
spa_list_consume(t, &driver->follower_list, follower_link) {
spa_list_remove(&t->follower_link);
spa_list_init(&t->follower_link);
}
pw_log_info("driver %p: '%s'", driver, driver->name);
pw_log_debug("driver %p: '%s'", driver, driver->name);
spa_list_init(&queue);
spa_list_append(&queue, &driver->sort_link);
@ -791,34 +791,34 @@ int pw_context_recalc_graph(struct pw_context *context)
/* start from all drivers and group all nodes that are linked
* to it. Some nodes are not (yet) linked to anything and they
* will end up 'unassigned' to a master. Other nodes are master
* and if they have active slaves, we can use them to schedule
* and if they have active followers, we can use them to schedule
* the unassigned nodes. */
target = NULL;
spa_list_for_each(n, &context->driver_list, driver_link) {
uint32_t active_slaves;
uint32_t active_followers;
if (n->active && !n->visited)
collect_nodes(n);
/* from now on we are only interested in nodes that are
* a master. We're going to count the number of slaves it
* a master. We're going to count the number of followers it
* has. */
if (!n->master)
continue;
active_slaves = 0;
spa_list_for_each(s, &n->slave_list, slave_link) {
pw_log_info(NAME" %p: driver %p: slave %p %s: %d",
active_followers = 0;
spa_list_for_each(s, &n->follower_list, follower_link) {
pw_log_debug(NAME" %p: driver %p: follower %p %s: %d",
context, n, s, s->name, s->active);
if (s != n && s->active)
active_slaves++;
active_followers++;
}
pw_log_info(NAME" %p: driver %p active slaves %d",
context, n, active_slaves);
pw_log_debug(NAME" %p: driver %p active followers %d",
context, n, active_followers);
/* if the master has active slaves, it is a target for our
/* if the master has active followers, it is a target for our
* unassigned nodes */
if (active_slaves > 0) {
if (active_followers > 0) {
if (target == NULL)
target = n;
}
@ -830,7 +830,7 @@ int pw_context_recalc_graph(struct pw_context *context)
spa_list_for_each(n, &context->node_list, link) {
if (!n->visited) {
pw_log_info(NAME" %p: unassigned node %p: '%s' %d %d", context,
pw_log_debug(NAME" %p: unassigned node %p: '%s' %d %d", context,
n, n->name, n->active, n->want_driver);
if (!n->want_driver)
@ -848,7 +848,7 @@ int pw_context_recalc_graph(struct pw_context *context)
n->visited = false;
}
/* assign final quantum and debug masters and slaves */
/* assign final quantum and debug masters and followers */
spa_list_for_each(n, &context->driver_list, driver_link) {
if (!n->master)
continue;
@ -859,8 +859,8 @@ int pw_context_recalc_graph(struct pw_context *context)
pw_log_info(NAME" %p: master %p quantum:%u '%s'", context, n,
n->quantum_current, n->name);
spa_list_for_each(s, &n->slave_list, slave_link)
pw_log_info(NAME" %p: slave %p: active:%d '%s'",
spa_list_for_each(s, &n->follower_list, follower_link)
pw_log_info(NAME" %p: follower %p: active:%d '%s'",
context, s, s->active, s->name);
}
return 0;

20
src/pipewire/impl-node.c
View file

@ -657,8 +657,8 @@ int pw_impl_node_set_driver(struct pw_impl_node *node, struct pw_impl_node *driv
if (driver == NULL)
driver = node;
spa_list_remove(&node->slave_link);
spa_list_append(&driver->slave_list, &node->slave_link);
spa_list_remove(&node->follower_link);
spa_list_append(&driver->follower_list, &node->follower_link);
if (old == driver)
return 0;
@ -992,7 +992,7 @@ struct pw_impl_node *pw_context_create_node(struct pw_context *context,
this->data_loop = context->data_loop;
spa_list_init(&this->slave_list);
spa_list_init(&this->follower_list);
spa_hook_list_init(&this->listener_list);
@ -1023,7 +1023,7 @@ struct pw_impl_node *pw_context_create_node(struct pw_context *context,
check_properties(this);
this->driver_node = this;
spa_list_append(&this->slave_list, &this->slave_link);
spa_list_append(&this->follower_list, &this->follower_link);
this->master = true;
return this;
@ -1480,7 +1480,7 @@ void pw_impl_node_destroy(struct pw_impl_node *node)
{
struct impl *impl = SPA_CONTAINER_OF(node, struct impl, this);
struct pw_impl_port *port;
struct pw_impl_node *slave;
struct pw_impl_node *follower;
node->active = false;
@ -1491,13 +1491,13 @@ void pw_impl_node_destroy(struct pw_impl_node *node)
pw_log_debug(NAME" %p: driver node %p", impl, node->driver_node);
/* remove ourself as a slave from the driver node */
spa_list_remove(&node->slave_link);
/* remove ourself as a follower from the driver node */
spa_list_remove(&node->follower_link);
remove_segment_master(node->driver_node, node->info.id);
spa_list_consume(slave, &node->slave_list, slave_link) {
pw_log_debug(NAME" %p: reslave %p", impl, slave);
pw_impl_node_set_driver(slave, NULL);
spa_list_consume(follower, &node->follower_list, follower_link) {
pw_log_debug(NAME" %p: reassign follower %p", impl, follower);
pw_impl_node_set_driver(follower, NULL);
}
if (node->registered) {

4
src/pipewire/private.h
View file

@ -524,8 +524,8 @@ struct pw_impl_node {
struct spa_list driver_link;
struct pw_impl_node *driver_node;
struct spa_list slave_list;
struct spa_list slave_link;
struct spa_list follower_list;
struct spa_list follower_link;
struct spa_list sort_link; /**< link used to sort nodes */

12
src/pipewire/stream.c
View file

@ -1349,7 +1349,7 @@ pw_stream_connect(struct pw_stream *stream,
struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this);
struct pw_impl_factory *factory;
struct pw_properties *props;
struct pw_impl_node *slave;
struct pw_impl_node *follower;
const char *str;
uint32_t i;
int res;
@ -1446,13 +1446,13 @@ pw_stream_connect(struct pw_stream *stream,
pw_properties_set(props, "resample.peaks", "1");
}
slave = pw_context_create_node(impl->context, pw_properties_copy(props), 0);
if (slave == NULL) {
follower = pw_context_create_node(impl->context, pw_properties_copy(props), 0);
if (follower == NULL) {
res = -errno;
goto error_node;
}
pw_impl_node_set_implementation(slave, &impl->impl_node);
pw_impl_node_set_implementation(follower, &impl->impl_node);
if (impl->media_type == SPA_MEDIA_TYPE_audio &&
impl->media_subtype == SPA_MEDIA_SUBTYPE_raw) {
@ -1462,7 +1462,7 @@ pw_stream_connect(struct pw_stream *stream,
res = -ENOENT;
goto error_node;
}
pw_properties_setf(props, "adapt.slave.node", "pointer:%p", slave);
pw_properties_setf(props, "adapt.follower.node", "pointer:%p", follower);
impl->node = pw_impl_factory_create_object(factory,
NULL,
PW_TYPE_INTERFACE_Node,
@ -1474,7 +1474,7 @@ pw_stream_connect(struct pw_stream *stream,
goto error_node;
}
} else {
impl->node = slave;
impl->node = follower;
}
if (!SPA_FLAG_IS_SET(impl->flags, PW_STREAM_FLAG_INACTIVE))
pw_impl_node_set_active(impl->node, true);