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

policy-node: force channel setup of target node

Browse source 
When we are switching to a target node, force a downmix to the
target channel layout if we can. Don't try to upmix for now and
don't try to mix when the dont-mix flag is set.
This commit is contained in:
Wim Taymans 2020-08-19 11:50:59 +02:00
parent d878843c2b
commit 1e2d5e6837
1 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -139,7 +139,7 @@ static bool find_format(struct node *node)
return have_format; return have_format;
} }
static int configure_node(struct node *node, struct spa_audio_info *info) static int configure_node(struct node *node, struct spa_audio_info *info, bool force)
{ {
struct impl *impl = node->impl; struct impl *impl = node->impl;
char buf[1024]; char buf[1024];
@ -147,20 +147,19 @@ static int configure_node(struct node *node, struct spa_audio_info *info)
struct spa_pod *param; struct spa_pod *param;
struct spa_audio_info format; struct spa_audio_info format;
if (node->configured) if (node->configured && !force)
return 0; return 0;
format = node->format; format = node->format;
if (info != NULL) { if (info != NULL && info->info.raw.channels > 0) {
if (info->info.raw.channels < format.info.raw.channels || node->monitor) { if (node->monitor || info->info.raw.channels < format.info.raw.channels) {
pw_log_info("node %d monitor:%d downmix %d to %d", pw_log_info("node %d monitor:%d channelmix %d:%d",
node->id, node->monitor, format.info.raw.channels, node->id, node->monitor, format.info.raw.channels,
info->info.raw.channels); info->info.raw.channels);
format = *info; format = *info;
} }
} }
format.info.raw.rate = impl->sample_rate; format.info.raw.rate = impl->sample_rate;
spa_pod_builder_init(&b, buf, sizeof(buf)); spa_pod_builder_init(&b, buf, sizeof(buf));
@ -451,26 +450,13 @@ static int link_nodes(struct node *node, struct node *peer)
struct pw_properties *props; struct pw_properties *props;
struct node *output, *input; struct node *output, *input;
pw_log_debug(NAME " %p: link nodes %d %d", impl, node->id, peer->id); pw_log_debug(NAME " %p: link nodes %d %d remix:%d", impl,
node->id, peer->id, !node->dont_remix);
if (node->dont_remix) if (node->dont_remix)
configure_node(node, NULL); configure_node(node, NULL, false);
else { else {
#if 0 configure_node(node, &peer->format, true);
bool configured = node->configured;
if (configured) {
node->configured = false;
pw_node_send_command((struct pw_node*)node->obj->obj.proxy,
&SPA_NODE_COMMAND_INIT(SPA_NODE_COMMAND_Suspend));
}
#endif
configure_node(node, &peer->format);
#if 0
if (configured) {
pw_node_send_command((struct pw_node*)node->obj->obj.proxy,
&SPA_NODE_COMMAND_INIT(SPA_NODE_COMMAND_Pause));
}
#endif
} }
if (node->direction == PW_DIRECTION_INPUT) { if (node->direction == PW_DIRECTION_INPUT) {
@ -537,7 +523,7 @@ static int rescan_node(struct impl *impl, struct node *n)
} }
if (n->type == NODE_TYPE_DEVICE) { if (n->type == NODE_TYPE_DEVICE) {
configure_node(n, NULL); configure_node(n, NULL, false);
return 0; return 0;
} }
@ -563,7 +549,7 @@ static int rescan_node(struct impl *impl, struct node *n)
str = spa_dict_lookup(props, PW_KEY_NODE_AUTOCONNECT); str = spa_dict_lookup(props, PW_KEY_NODE_AUTOCONNECT);
if (str == NULL || !pw_properties_parse_bool(str)) { if (str == NULL || !pw_properties_parse_bool(str)) {
pw_log_debug(NAME" %p: node %d does not need autoconnect", impl, n->id); pw_log_debug(NAME" %p: node %d does not need autoconnect", impl, n->id);
configure_node(n, NULL); configure_node(n, NULL, false);
return 0; return 0;
} }