mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

media-session: simplify routing a bit

Browse source 
1) detect port changes
2) restore or save port changes
3) if port changes:
     check and restore the best profile
     else check and restore the best ports
4) if profile changed, check and restore best ports

See #533
See #708
This commit is contained in:
Wim Taymans 2021-02-24 20:22:57 +01:00
parent 27f85d1f52
commit 6f26210361
1 changed files with 31 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/examples/media-session/default-routes.c
View file

@ -691,31 +691,19 @@ static int restore_device_route(struct device *dev, const char *val, uint32_t de
return res; return res;
} }
static int handle_profile(struct device *dev) static int reconfigure_profile(struct device *dev, struct profile *pr)
{ {
struct impl *impl = dev->impl; struct impl *impl = dev->impl;
struct profile pr;
int res;
char key[1024]; char key[1024];
const char *json; const char *json;
if ((res = find_current_profile(dev, &pr)) < 0)
return res;
if (dev->active_profile == pr.index)
return 0;
pw_log_info("device %s: restore routes for profile '%s'",
dev->name, pr.name);
dev->active_profile = pr.index;
snprintf(dev->profile_name, sizeof(dev->profile_name), "%s", pr.name);
snprintf(key, sizeof(key), PREFIX"%s:profile:%s", dev->name, dev->profile_name); snprintf(key, sizeof(key), PREFIX"%s:profile:%s", dev->name, dev->profile_name);
json = pw_properties_get(impl->to_restore, key); json = pw_properties_get(impl->to_restore, key);
if (pr.classes != NULL) { if (pr->classes != NULL) {
struct spa_pod *iter; struct spa_pod *iter;
SPA_POD_STRUCT_FOREACH(pr.classes, iter) { SPA_POD_STRUCT_FOREACH(pr->classes, iter) {
struct spa_pod_parser prs; struct spa_pod_parser prs;
struct spa_pod_frame f[1]; struct spa_pod_frame f[1];
struct spa_pod *val; struct spa_pod *val;
@ -745,10 +733,27 @@ static int handle_profile(struct device *dev)
spa_pod_parser_pop(&prs, &f[0]); spa_pod_parser_pop(&prs, &f[0]);
} }
} }
return 0; return 0;
} }
static int handle_profile(struct device *dev)
{
struct profile pr;
int res;
if ((res = find_current_profile(dev, &pr)) < 0)
return res;
if (dev->active_profile == pr.index)
return 0;
pw_log_info("device %s: restore routes for profile '%s'",
dev->name, pr.name);
dev->active_profile = pr.index;
snprintf(dev->profile_name, sizeof(dev->profile_name), "%s", pr.name);
return reconfigure_profile(dev, &pr);
}
static void prune_route_info(struct device *dev) static void prune_route_info(struct device *dev)
{ {
struct route_info *i; struct route_info *i;
@ -786,7 +791,6 @@ static int set_profile(struct device *dev, struct profile *pr)
static int handle_route(struct device *dev, struct route *r) static int handle_route(struct device *dev, struct route *r)
{ {
struct route_info *ri; struct route_info *ri;
int res;
pw_log_info("device %d: port '%s'", dev->id, r->name); pw_log_info("device %d: port '%s'", dev->id, r->name);
if ((ri = find_route_info(dev, r)) == NULL) if ((ri = find_route_info(dev, r)) == NULL)
@ -799,20 +803,7 @@ static int handle_route(struct device *dev, struct route *r)
* save this as a prefered port */ * save this as a prefered port */
pw_log_info("device %d: new active port found '%s'", dev->id, r->name); pw_log_info("device %d: new active port found '%s'", dev->id, r->name);
restore_route(dev, r); restore_route(dev, r);
} else if (ri->available != r->available && r->available != SPA_PARAM_AVAILABILITY_yes) { } else if (r->props) {
struct route t;
/* an existing port has changed to unavailable */
pw_log_info("device %d: route '%s' not available", dev->id, r->name);
/* try to find a new best port */
res = find_best_route(dev, r->device_id, &t);
if (res < 0) {
pw_log_info("device %d: can't find best route", dev->id);
} else {
pw_log_info("device %d: found best route '%s'", dev->id,
t.name);
restore_route(dev, &t);
}
} else if (ri->prev_active && r->props) {
/* just save port properties */ /* just save port properties */
save_route(dev, r); save_route(dev, r);
} }
@ -847,7 +838,14 @@ static int handle_routes(struct device *dev)
ri->prev_active = ri->active; ri->prev_active = ri->active;
ri->active = false; ri->active = false;
} }
/* then check for changes in the active ports */
spa_list_for_each(p, &dev->obj->param_list, link) {
struct route r;
if (p->id != SPA_PARAM_Route ||
parse_route(p, &r) < 0)
continue;
handle_route(dev, &r);
}
if (changed) { if (changed) {
struct profile best; struct profile best;
@ -867,16 +865,9 @@ static int handle_routes(struct device *dev)
} else { } else {
pw_log_info("device %d: best profile %s already active", pw_log_info("device %d: best profile %s already active",
dev->id, best.name); dev->id, best.name);
reconfigure_profile(dev, &best);
} }
} }
/* then check for changes in the active ports */
spa_list_for_each(p, &dev->obj->param_list, link) {
struct route r;
if (p->id != SPA_PARAM_Route ||
parse_route(p, &r) < 0)
continue;
handle_route(dev, &r);
}
prune_route_info(dev); prune_route_info(dev);
save_profile(dev); save_profile(dev);