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

policy-node: implement video nodes

Browse source 
Always activate video nodes right away
Implement exclusive access again
This commit is contained in:
Wim Taymans 2020-01-08 10:48:48 +01:00
parent fa98389fef
commit ffbb74c4af
1 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/examples/media-session/policy-node.c
View file

@ -71,7 +71,7 @@ struct node {
struct spa_hook listener; struct spa_hook listener;
uint32_t linked; struct node *peer;
uint32_t client_id; uint32_t client_id;
int32_t priority; int32_t priority;
@ -88,7 +88,6 @@ struct node {
unsigned int active:1; unsigned int active:1;
unsigned int exclusive:1; unsigned int exclusive:1;
unsigned int enabled:1; unsigned int enabled:1;
unsigned int busy:1;
}; };
static int activate_node(struct node *node) static int activate_node(struct node *node)
@ -205,6 +204,9 @@ handle_node(struct impl *impl, struct sm_object *object)
else else
return 0; return 0;
if (strstr(media_class, "Video") == media_class)
node->active = true;
node->direction = direction; node->direction = direction;
node->type = NODE_TYPE_STREAM; node->type = NODE_TYPE_STREAM;
node->media = strdup(media_class); node->media = strdup(media_class);
@ -219,6 +221,7 @@ handle_node(struct impl *impl, struct sm_object *object)
else if (strstr(media_class, "Video/") == media_class) { else if (strstr(media_class, "Video/") == media_class) {
media_class += strlen("Video/"); media_class += strlen("Video/");
media = "Video"; media = "Video";
node->active = true;
} }
else else
return 0; return 0;
@ -248,6 +251,8 @@ static void destroy_node(struct impl *impl, struct node *node)
{ {
spa_list_remove(&node->link); spa_list_remove(&node->link);
free(node->media); free(node->media);
if (node->peer)
node->peer->peer = NULL;
sm_object_remove_data((struct sm_object*)node->obj, SESSION_KEY); sm_object_remove_data((struct sm_object*)node->obj, SESSION_KEY);
} }
@ -274,9 +279,15 @@ static void session_remove(void *data, struct sm_object *object)
pw_log_debug(NAME " %p: remove global '%d'", impl, object->id); pw_log_debug(NAME " %p: remove global '%d'", impl, object->id);
if (strcmp(object->type, PW_TYPE_INTERFACE_Node) == 0) { if (strcmp(object->type, PW_TYPE_INTERFACE_Node) == 0) {
struct node *node; struct node *n, *node;
if ((node = sm_object_get_data(object, SESSION_KEY)) != NULL) if ((node = sm_object_get_data(object, SESSION_KEY)) != NULL)
destroy_node(impl, node); destroy_node(impl, node);
spa_list_for_each(n, &impl->node_list, link) {
if (n->peer == node)
n->peer = NULL;
}
} }
sm_media_session_schedule_rescan(impl->session); sm_media_session_schedule_rescan(impl->session);
@ -298,8 +309,8 @@ static int find_node(void *data, struct node *node)
int priority = 0; int priority = 0;
uint64_t plugged = 0; uint64_t plugged = 0;
pw_log_debug(NAME " %p: looking at node '%d' enabled:%d busy:%d exclusive:%d", pw_log_debug(NAME " %p: looking at node '%d' enabled:%d state:%d peer:%p exclusive:%d",
impl, node->id, node->enabled, node->busy, node->exclusive); impl, node->id, node->enabled, node->obj->info->state, node->peer, node->exclusive);
if (!node->enabled || node->type == NODE_TYPE_UNKNOWN) if (!node->enabled || node->type == NODE_TYPE_UNKNOWN)
return 0; return 0;
@ -316,7 +327,8 @@ static int find_node(void *data, struct node *node)
plugged = node->plugged; plugged = node->plugged;
priority = node->priority; priority = node->priority;
if ((find->exclusive && node->busy) || node->exclusive) { if ((find->exclusive && node->obj->info->state == PW_NODE_STATE_RUNNING) ||
(node->peer && node->peer->exclusive)) {
pw_log_debug(NAME " %p: node '%d' in use", impl, node->id); pw_log_debug(NAME " %p: node '%d' in use", impl, node->id);
return 0; return 0;
} }
@ -342,6 +354,9 @@ static int link_nodes(struct node *node, struct node *peer)
pw_log_debug(NAME " %p: link nodes %d %d", impl, node->id, peer->id); pw_log_debug(NAME " %p: link nodes %d %d", impl, node->id, peer->id);
peer->peer = node;
node->peer = peer;
if (node->direction == PW_DIRECTION_INPUT) { if (node->direction == PW_DIRECTION_INPUT) {
struct node *t = node; struct node *t = node;
node = peer; node = peer;
@ -357,9 +372,6 @@ static int link_nodes(struct node *node, struct node *peer)
pw_properties_free(props); pw_properties_free(props);
node->linked++;
peer->linked++;
return 0; return 0;
} }
@ -376,15 +388,17 @@ static int rescan_node(struct impl *impl, struct node *n)
if (n->type == NODE_TYPE_DEVICE) if (n->type == NODE_TYPE_DEVICE)
return 0; return 0;
if (!n->active) if (!n->active) {
pw_log_debug(NAME " %p: node %d is not active", impl, n->id);
return 0; return 0;
}
if (n->obj->info == NULL || n->obj->info->props == NULL) { if (n->obj->info == NULL || n->obj->info->props == NULL) {
pw_log_debug(NAME " %p: node %d has no properties", impl, n->id); pw_log_debug(NAME " %p: node %d has no properties", impl, n->id);
return 0; return 0;
} }
if (n->linked > 0) { if (n->peer != NULL) {
pw_log_debug(NAME " %p: node %d is already linked", impl, n->id); pw_log_debug(NAME " %p: node %d is already linked", impl, n->id);
return 0; return 0;
} }
@ -451,16 +465,14 @@ static int rescan_node(struct impl *impl, struct node *n)
} }
peer = find.node; peer = find.node;
if (exclusive && peer->busy) { if (exclusive && peer->obj->info->state == PW_NODE_STATE_RUNNING) {
pw_log_warn(NAME" %p: node %d busy, can't get exclusive access", impl, peer->id); pw_log_warn(NAME" %p: node %d busy, can't get exclusive access", impl, peer->id);
return -EBUSY; return -EBUSY;
} }
peer->exclusive = exclusive; n->exclusive = exclusive;
pw_log_debug(NAME" %p: linking to node '%d'", impl, peer->id); pw_log_debug(NAME" %p: linking to node '%d'", impl, peer->id);
peer->busy = true;
do_link: do_link:
link_nodes(n, peer); link_nodes(n, peer);
return 1; return 1;