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

alsa: reconfigure max latency based on buffer size

Browse source 
We can't ever support a latency larger than half the buffer size.
Take a fourth of the buffer size to have some extre headroom.

See #724
This commit is contained in:
Wim Taymans 2021-03-02 10:34:41 +01:00
parent 00d8d1472d
commit 1dfa36d77b
2 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
spa/plugins/alsa/alsa-pcm-sink.c
View file

@ -269,18 +269,25 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
return 0; return 0;
} }
static const struct spa_dict_item node_info_items[] = {
{ SPA_KEY_DEVICE_API, "alsa" },
{ SPA_KEY_MEDIA_CLASS, "Audio/Sink" },
{ SPA_KEY_NODE_DRIVER, "true" },
};
static void emit_node_info(struct state *this, bool full) static void emit_node_info(struct state *this, bool full)
{ {
if (full) if (full)
this->info.change_mask = this->info_all; this->info.change_mask = this->info_all;
if (this->info.change_mask) { if (this->info.change_mask) {
this->info.props = &SPA_DICT_INIT_ARRAY(node_info_items); struct spa_dict_item items[4];
uint32_t n_items = 0;
char latency[64];
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_API, "alsa");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS, "Audio/Sink");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_DRIVER, "true");
if (this->have_format) {
snprintf(latency, sizeof(latency), "%lu/%d", this->buffer_frames / 4, this->rate);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_LATENCY, latency);
}
this->info.props = &SPA_DICT_INIT(items, n_items);
spa_node_emit_info(&this->hooks, &this->info); spa_node_emit_info(&this->hooks, &this->info);
this->info.change_mask = 0; this->info.change_mask = 0;
} }
@ -505,6 +512,9 @@ static int port_set_format(void *object,
this->have_format = true; this->have_format = true;
} }
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PROPS;
emit_node_info(this, false);
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_RATE; this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_RATE;
this->port_info.rate = SPA_FRACTION(1, this->rate); this->port_info.rate = SPA_FRACTION(1, this->rate);
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS; this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;

23
spa/plugins/alsa/alsa-pcm-source.c
View file

@ -271,18 +271,24 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
return 0; return 0;
} }
static const struct spa_dict_item node_info_items[] = {
{ SPA_KEY_DEVICE_API, "alsa" },
{ SPA_KEY_MEDIA_CLASS, "Audio/Source" },
{ SPA_KEY_NODE_DRIVER, "true" },
};
static void emit_node_info(struct state *this, bool full) static void emit_node_info(struct state *this, bool full)
{ {
if (full) if (full)
this->info.change_mask = this->info_all; this->info.change_mask = this->info_all;
if (this->info.change_mask) { if (this->info.change_mask) {
this->info.props = &SPA_DICT_INIT_ARRAY(node_info_items); struct spa_dict_item items[4];
uint32_t n_items = 0;
char latency[64];
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_API, "alsa");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS, "Audio/Source");
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_DRIVER, "true");
if (this->have_format) {
snprintf(latency, sizeof(latency), "%lu/%d", this->buffer_frames / 4, this->rate);
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_LATENCY, latency);
}
this->info.props = &SPA_DICT_INIT(items, n_items);
spa_node_emit_info(&this->hooks, &this->info); spa_node_emit_info(&this->hooks, &this->info);
this->info.change_mask = 0; this->info.change_mask = 0;
} }
@ -505,6 +511,9 @@ static int port_set_format(void *object,
this->have_format = true; this->have_format = true;
} }
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PROPS;
emit_node_info(this, false);
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_RATE; this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_RATE;
this->port_info.rate = SPA_FRACTION(1, this->rate); this->port_info.rate = SPA_FRACTION(1, this->rate);
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS; this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;