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

acp: pass channelmap around

Browse source 
so that we can use it as a default in channelmix
This commit is contained in:
Wim Taymans 2020-12-18 17:18:53 +01:00
parent c3973fd9ec
commit a25f1a6a1d
2 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spa/plugins/alsa/alsa-acp-device.c
View file

@ -141,9 +141,10 @@ static int emit_node(struct impl *this, struct acp_device *dev)
{ {
struct spa_dict_item *items; struct spa_dict_item *items;
const struct acp_dict_item *it; const struct acp_dict_item *it;
uint32_t n_items; uint32_t n_items, i;
char device_name[128], path[180], channels[16]; char device_name[128], path[180], channels[16];
char card_id[16], *p; char card_id[16], *p;
char positions[SPA_AUDIO_MAX_CHANNELS * 6];
struct spa_device_object_info info; struct spa_device_object_info info;
struct acp_card *card = this->card; struct acp_card *card = this->card;
const char *stream, *devstr;; const char *stream, *devstr;;
@ -161,7 +162,7 @@ static int emit_node(struct impl *this, struct acp_device *dev)
info.change_mask = SPA_DEVICE_OBJECT_CHANGE_MASK_PROPS; info.change_mask = SPA_DEVICE_OBJECT_CHANGE_MASK_PROPS;
n_items = dev->props.n_items + 5; n_items = dev->props.n_items + 6;
items = alloca(n_items * sizeof(*items)); items = alloca(n_items * sizeof(*items));
snprintf(card_id, sizeof(card), "%d", card->index); snprintf(card_id, sizeof(card), "%d", card->index);
@ -181,9 +182,16 @@ static int emit_node(struct impl *this, struct acp_device *dev)
items[2] = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_PCM_CARD, card_id); items[2] = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_PCM_CARD, card_id);
items[3] = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_PCM_STREAM, stream); items[3] = SPA_DICT_ITEM_INIT(SPA_KEY_API_ALSA_PCM_STREAM, stream);
snprintf(channels, sizeof(channels), "%d", dev->format.channels); snprintf(channels, sizeof(channels)-1, "%d", dev->format.channels);
items[4] = SPA_DICT_ITEM_INIT(SPA_KEY_AUDIO_CHANNELS, channels); items[4] = SPA_DICT_ITEM_INIT(SPA_KEY_AUDIO_CHANNELS, channels);
n_items = 5;
p = positions;
for (i = 0; i < dev->format.channels; i++)
p += snprintf(p, 6, "%s%s", i == 0 ? "" : ",",
spa_debug_type_short_name(spa_type_audio_channel[dev->format.map[i]].name));
items[5] = SPA_DICT_ITEM_INIT(SPA_KEY_AUDIO_POSITION, positions);
n_items = 6;
acp_dict_for_each(it, &dev->props) acp_dict_for_each(it, &dev->props)
items[n_items++] = SPA_DICT_ITEM_INIT(it->key, it->value); items[n_items++] = SPA_DICT_ITEM_INIT(it->key, it->value);

25
spa/plugins/audioconvert/channelmix.c
View file

@ -1199,6 +1199,16 @@ impl_get_size(const struct spa_handle_factory *factory,
return sizeof(struct impl); return sizeof(struct impl);
} }
static uint32_t channel_from_name(const char *name, size_t len)
{
int i;
for (i = 0; spa_type_audio_channel[i].name; i++) {
if (strncmp(name, spa_debug_type_short_name(spa_type_audio_channel[i].name), len) == 0)
return spa_type_audio_channel[i].type;
}
return SPA_AUDIO_CHANNEL_UNKNOWN;
}
static int static int
impl_init(const struct spa_handle_factory *factory, impl_init(const struct spa_handle_factory *factory,
struct spa_handle *handle, struct spa_handle *handle,
@ -1226,6 +1236,8 @@ impl_init(const struct spa_handle_factory *factory,
spa_hook_list_init(&this->hooks); spa_hook_list_init(&this->hooks);
props_reset(&this->props);
if (info != NULL) { if (info != NULL) {
if ((str = spa_dict_lookup(info, "channelmix.normalize")) != NULL && if ((str = spa_dict_lookup(info, "channelmix.normalize")) != NULL &&
(strcmp(str, "true") == 0 || atoi(str) != 0)) (strcmp(str, "true") == 0 || atoi(str) != 0))
@ -1233,7 +1245,19 @@ impl_init(const struct spa_handle_factory *factory,
if ((str = spa_dict_lookup(info, "channelmix.mix-lfe")) != NULL && if ((str = spa_dict_lookup(info, "channelmix.mix-lfe")) != NULL &&
(strcmp(str, "true") == 0 || atoi(str) != 0)) (strcmp(str, "true") == 0 || atoi(str) != 0))
this->mix.options |= CHANNELMIX_OPTION_MIX_LFE; this->mix.options |= CHANNELMIX_OPTION_MIX_LFE;
if ((str = spa_dict_lookup(info, SPA_KEY_AUDIO_POSITION)) != NULL) {
size_t len;
const char *p = str;
while (*p && this->props.n_channels < SPA_AUDIO_MAX_CHANNELS) {
if ((len = strcspn(p, ",")) == 0)
break;
this->props.channel_map[this->props.n_channels++] =
channel_from_name(p, len);
p += len + strspn(p+len, ",");
}
}
} }
this->props.n_channel_volumes = this->props.n_channels;
this->node.iface = SPA_INTERFACE_INIT( this->node.iface = SPA_INTERFACE_INIT(
SPA_TYPE_INTERFACE_Node, SPA_TYPE_INTERFACE_Node,
@ -1249,7 +1273,6 @@ impl_init(const struct spa_handle_factory *factory,
this->params[1] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE); this->params[1] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
this->info.params = this->params; this->info.params = this->params;
this->info.n_params = 2; this->info.n_params = 2;
props_reset(&this->props);
port = GET_OUT_PORT(this, 0); port = GET_OUT_PORT(this, 0);
port->direction = SPA_DIRECTION_OUTPUT; port->direction = SPA_DIRECTION_OUTPUT;