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: use ProcessLatency param to get and set internal latency

Browse source
This commit is contained in:
Wim Taymans 2021-08-17 09:14:40 +02:00
parent ee6d363481
commit 6d196b1d11
4 changed files with 174 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,6 +55,44 @@ static void reset_props(struct props *props)
props->use_chmap = DEFAULT_USE_CHMAP; props->use_chmap = DEFAULT_USE_CHMAP;
} }
static void emit_node_info(struct state *this, bool full)
{
uint64_t old = full ? this->info.change_mask : 0;
if (full)
this->info.change_mask = this->info_all;
if (this->info.change_mask) {
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_MAX_LATENCY, latency);
}
this->info.props = &SPA_DICT_INIT(items, n_items);
spa_node_emit_info(&this->hooks, &this->info);
this->info.change_mask = old;
}
}
static void emit_port_info(struct state *this, bool full)
{
uint64_t old = full ? this->port_info.change_mask : 0;
if (full)
this->port_info.change_mask = this->port_info_all;
if (this->port_info.change_mask) {
spa_node_emit_port_info(&this->hooks,
SPA_DIRECTION_INPUT, 0, &this->port_info);
this->port_info.change_mask = old;
}
}
static int impl_node_enum_params(void *object, int seq, static int impl_node_enum_params(void *object, int seq,
uint32_t id, uint32_t start, uint32_t num, uint32_t id, uint32_t start, uint32_t num,
const struct spa_pod *filter) const struct spa_pod *filter)
@ -168,6 +206,16 @@ static int impl_node_enum_params(void *object, int seq,
} }
break; break;
case SPA_PARAM_ProcessLatency:
switch (result.index) {
case 0:
param = spa_process_latency_build(&b, id, &this->process_latency);
break;
default:
return 0;
}
break;
default: default:
return -ENOENT; return -ENOENT;
} }
@ -208,10 +256,13 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
const struct spa_pod *param) const struct spa_pod *param)
{ {
struct state *this = object; struct state *this = object;
int res;
spa_return_val_if_fail(this != NULL, -EINVAL); spa_return_val_if_fail(this != NULL, -EINVAL);
if (id == SPA_PARAM_Props) { switch (id) {
case SPA_PARAM_Props:
{
struct props *p = &this->props; struct props *p = &this->props;
if (param == NULL) { if (param == NULL) {
@ -224,10 +275,27 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
SPA_PROP_minLatency, SPA_POD_OPT_Int(&p->min_latency), SPA_PROP_minLatency, SPA_POD_OPT_Int(&p->min_latency),
SPA_PROP_maxLatency, SPA_POD_OPT_Int(&p->max_latency), SPA_PROP_maxLatency, SPA_POD_OPT_Int(&p->max_latency),
SPA_PROP_START_CUSTOM, SPA_POD_OPT_Bool(&p->use_chmap)); SPA_PROP_START_CUSTOM, SPA_POD_OPT_Bool(&p->use_chmap));
break;
} }
else case SPA_PARAM_ProcessLatency:
return -ENOENT; {
struct spa_process_latency_info info;
if ((res = spa_process_latency_parse(param, &info)) < 0)
return res;
this->process_latency = info;
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->params[NODE_ProcessLatency].flags ^= SPA_PARAM_INFO_SERIAL;
emit_node_info(this, false);
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
this->port_params[PORT_Latency].flags ^= SPA_PARAM_INFO_SERIAL;
emit_port_info(this, false);
break;
}
default:
return -ENOENT;
}
return 0; return 0;
} }
@ -271,44 +339,6 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
} }
static void emit_node_info(struct state *this, bool full)
{
uint64_t old = full ? this->info.change_mask : 0;
if (full)
this->info.change_mask = this->info_all;
if (this->info.change_mask) {
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_MAX_LATENCY, latency);
}
this->info.props = &SPA_DICT_INIT(items, n_items);
spa_node_emit_info(&this->hooks, &this->info);
this->info.change_mask = old;
}
}
static void emit_port_info(struct state *this, bool full)
{
uint64_t old = full ? this->port_info.change_mask : 0;
if (full)
this->port_info.change_mask = this->port_info_all;
if (this->port_info.change_mask) {
spa_node_emit_port_info(&this->hooks,
SPA_DIRECTION_INPUT, 0, &this->port_info);
this->port_info.change_mask = old;
}
}
static int static int
impl_node_add_listener(void *object, impl_node_add_listener(void *object,
struct spa_hook *listener, struct spa_hook *listener,
@ -459,8 +489,13 @@ impl_node_port_enum_params(void *object, int seq,
case SPA_PARAM_Latency: case SPA_PARAM_Latency:
switch (result.index) { switch (result.index) {
case 0: case 1: case 0: case 1:
param = spa_latency_build(&b, id, &this->latency[result.index]); {
struct spa_latency_info latency = this->latency[result.index];
if (latency.direction == SPA_DIRECTION_INPUT)
spa_process_latency_info_add(&this->process_latency, &latency);
param = spa_latency_build(&b, id, &latency);
break; break;
}
default: default:
return 0; return 0;
} }
@ -806,6 +841,7 @@ impl_init(const struct spa_handle_factory *factory,
this->params[NODE_PropInfo] = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ); this->params[NODE_PropInfo] = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
this->params[NODE_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE); this->params[NODE_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
this->params[NODE_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ); this->params[NODE_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
this->params[NODE_ProcessLatency] = SPA_PARAM_INFO(SPA_PARAM_ProcessLatency, SPA_PARAM_INFO_READWRITE);
this->info.params = this->params; this->info.params = this->params;
this->info.n_params = N_NODE_PARAMS; this->info.n_params = N_NODE_PARAMS;

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

@ -55,6 +55,43 @@ static void reset_props(struct props *props)
props->use_chmap = DEFAULT_USE_CHMAP; props->use_chmap = DEFAULT_USE_CHMAP;
} }
static void emit_node_info(struct state *this, bool full)
{
uint64_t old = full ? this->info.change_mask : 0;
if (full)
this->info.change_mask = this->info_all;
if (this->info.change_mask) {
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_MAX_LATENCY, latency);
}
this->info.props = &SPA_DICT_INIT(items, n_items);
spa_node_emit_info(&this->hooks, &this->info);
this->info.change_mask = old;
}
}
static void emit_port_info(struct state *this, bool full)
{
uint64_t old = full ? this->port_info.change_mask : 0;
if (full)
this->port_info.change_mask = this->port_info_all;
if (this->port_info.change_mask) {
spa_node_emit_port_info(&this->hooks,
SPA_DIRECTION_OUTPUT, 0, &this->port_info);
this->port_info.change_mask = old;
}
}
static int impl_node_enum_params(void *object, int seq, static int impl_node_enum_params(void *object, int seq,
uint32_t id, uint32_t start, uint32_t num, uint32_t id, uint32_t start, uint32_t num,
const struct spa_pod *filter) const struct spa_pod *filter)
@ -165,6 +202,16 @@ static int impl_node_enum_params(void *object, int seq,
} }
break; break;
case SPA_PARAM_ProcessLatency:
switch (result.index) {
case 0:
param = spa_process_latency_build(&b, id, &this->process_latency);
break;
default:
return 0;
}
break;
default: default:
return -ENOENT; return -ENOENT;
} }
@ -206,6 +253,7 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
const struct spa_pod *param) const struct spa_pod *param)
{ {
struct state *this = object; struct state *this = object;
int res;
spa_return_val_if_fail(this != NULL, -EINVAL); spa_return_val_if_fail(this != NULL, -EINVAL);
@ -226,6 +274,22 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
SPA_PROP_START_CUSTOM, SPA_POD_OPT_Bool(&p->use_chmap)); SPA_PROP_START_CUSTOM, SPA_POD_OPT_Bool(&p->use_chmap));
break; break;
} }
case SPA_PARAM_ProcessLatency:
{
struct spa_process_latency_info info;
if ((res = spa_process_latency_parse(param, &info)) < 0)
return res;
this->process_latency = info;
this->info.change_mask |= SPA_NODE_CHANGE_MASK_PARAMS;
this->params[NODE_ProcessLatency].flags ^= SPA_PARAM_INFO_SERIAL;
emit_node_info(this, false);
this->port_info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
this->port_params[PORT_Latency].flags ^= SPA_PARAM_INFO_SERIAL;
emit_port_info(this, false);
break;
}
default: default:
return -ENOENT; return -ENOENT;
} }
@ -272,42 +336,6 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
return 0; return 0;
} }
static void emit_node_info(struct state *this, bool full)
{
uint64_t old = full ? this->info.change_mask : 0;
if (full)
this->info.change_mask = this->info_all;
if (this->info.change_mask) {
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_MAX_LATENCY, latency);
}
this->info.props = &SPA_DICT_INIT(items, n_items);
spa_node_emit_info(&this->hooks, &this->info);
this->info.change_mask = old;
}
}
static void emit_port_info(struct state *this, bool full)
{
uint64_t old = full ? this->port_info.change_mask : 0;
if (full)
this->port_info.change_mask = this->port_info_all;
if (this->port_info.change_mask) {
spa_node_emit_port_info(&this->hooks,
SPA_DIRECTION_OUTPUT, 0, &this->port_info);
this->port_info.change_mask = old;
}
}
static int static int
impl_node_add_listener(void *object, impl_node_add_listener(void *object,
struct spa_hook *listener, struct spa_hook *listener,
@ -457,8 +485,13 @@ impl_node_port_enum_params(void *object, int seq,
case SPA_PARAM_Latency: case SPA_PARAM_Latency:
switch (result.index) { switch (result.index) {
case 0: case 1: case 0: case 1:
param = spa_latency_build(&b, id, &this->latency[result.index]); {
struct spa_latency_info latency = this->latency[result.index];
if (latency.direction == SPA_DIRECTION_OUTPUT)
spa_process_latency_info_add(&this->process_latency, &latency);
param = spa_latency_build(&b, id, &latency);
break; break;
}
default: default:
return 0; return 0;
} }
@ -818,6 +851,7 @@ impl_init(const struct spa_handle_factory *factory,
this->params[NODE_PropInfo] = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ); this->params[NODE_PropInfo] = SPA_PARAM_INFO(SPA_PARAM_PropInfo, SPA_PARAM_INFO_READ);
this->params[NODE_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE); this->params[NODE_Props] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
this->params[NODE_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ); this->params[NODE_IO] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
this->params[NODE_ProcessLatency] = SPA_PARAM_INFO(SPA_PARAM_ProcessLatency, SPA_PARAM_INFO_READWRITE);
this->info.params = this->params; this->info.params = this->params;
this->info.n_params = N_NODE_PARAMS; this->info.n_params = N_NODE_PARAMS;
reset_props(&this->props); reset_props(&this->props);

4
spa/plugins/alsa/alsa-pcm.h
View file

@ -107,7 +107,8 @@ struct state {
#define NODE_PropInfo 0 #define NODE_PropInfo 0
#define NODE_Props 1 #define NODE_Props 1
#define NODE_IO 2 #define NODE_IO 2
#define N_NODE_PARAMS 3 #define NODE_ProcessLatency 3
#define N_NODE_PARAMS 4
struct spa_param_info params[N_NODE_PARAMS]; struct spa_param_info params[N_NODE_PARAMS];
struct props props; struct props props;
@ -198,6 +199,7 @@ struct state {
double max_error; double max_error;
struct spa_latency_info latency[2]; struct spa_latency_info latency[2];
struct spa_process_latency_info process_latency;
snd_use_case_mgr_t *ucm; snd_use_case_mgr_t *ucm;
}; };

14
spa/plugins/audioconvert/audioadapter.c
View file

@ -85,7 +85,8 @@ struct impl {
#define IDX_EnumPortConfig 4 #define IDX_EnumPortConfig 4
#define IDX_PortConfig 5 #define IDX_PortConfig 5
#define IDX_Latency 6 #define IDX_Latency 6
#define N_NODE_PARAMS 7 #define IDX_ProcessLatency 7
#define N_NODE_PARAMS 8
struct spa_param_info params[N_NODE_PARAMS]; struct spa_param_info params[N_NODE_PARAMS];
uint32_t convert_params_flags[N_NODE_PARAMS]; uint32_t convert_params_flags[N_NODE_PARAMS];
uint32_t follower_params_flags[N_NODE_PARAMS]; uint32_t follower_params_flags[N_NODE_PARAMS];
@ -132,6 +133,7 @@ next:
return res; return res;
case SPA_PARAM_PropInfo: case SPA_PARAM_PropInfo:
case SPA_PARAM_Props: case SPA_PARAM_Props:
case SPA_PARAM_ProcessLatency:
{ {
if (result.next < 0x10000) { if (result.next < 0x10000) {
if ((res = spa_node_enum_params_sync(this->convert, if ((res = spa_node_enum_params_sync(this->convert,
@ -458,6 +460,9 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
return res; return res;
res = 0; res = 0;
break; break;
case SPA_PARAM_ProcessLatency:
res = spa_node_set_param(this->follower, id, flags, param);
break;
default: default:
res = -ENOTSUP; res = -ENOTSUP;
break; break;
@ -698,6 +703,9 @@ static void follower_info(void *data, const struct spa_node_info *info)
case SPA_PARAM_Props: case SPA_PARAM_Props:
idx = IDX_Props; idx = IDX_Props;
break; break;
case SPA_PARAM_ProcessLatency:
idx = IDX_ProcessLatency;
break;
default: default:
continue; continue;
} }
@ -971,7 +979,8 @@ impl_node_port_set_param(void *object,
flags, param)) < 0) flags, param)) < 0)
return res; return res;
if (id == SPA_PARAM_Latency && direction == this->direction) { if ((id == SPA_PARAM_Latency) &&
direction == this->direction) {
if ((res = spa_node_port_set_param(this->follower, direction, 0, id, if ((res = spa_node_port_set_param(this->follower, direction, 0, id,
flags, param)) < 0) flags, param)) < 0)
return res; return res;
@ -1276,6 +1285,7 @@ impl_init(const struct spa_handle_factory *factory,
this->params[IDX_EnumPortConfig] = SPA_PARAM_INFO(SPA_PARAM_EnumPortConfig, SPA_PARAM_INFO_READ); this->params[IDX_EnumPortConfig] = SPA_PARAM_INFO(SPA_PARAM_EnumPortConfig, SPA_PARAM_INFO_READ);
this->params[IDX_PortConfig] = SPA_PARAM_INFO(SPA_PARAM_PortConfig, SPA_PARAM_INFO_READWRITE); this->params[IDX_PortConfig] = SPA_PARAM_INFO(SPA_PARAM_PortConfig, SPA_PARAM_INFO_READWRITE);
this->params[IDX_Latency] = SPA_PARAM_INFO(SPA_PARAM_Latency, SPA_PARAM_INFO_READWRITE); this->params[IDX_Latency] = SPA_PARAM_INFO(SPA_PARAM_Latency, SPA_PARAM_INFO_READWRITE);
this->params[IDX_ProcessLatency] = SPA_PARAM_INFO(SPA_PARAM_ProcessLatency, SPA_PARAM_INFO_READWRITE);
this->info.params = this->params; this->info.params = this->params;
this->info.n_params = N_NODE_PARAMS; this->info.n_params = N_NODE_PARAMS;