mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

audioadapter: don't emit result events for internal param enums

Browse source 
All of the _sync param enum calls are internal end should not result in
a result event externally.

See !2260
This commit is contained in:
Wim Taymans 2025-01-25 16:32:19 +01:00
parent 8b02e5f737
commit b72eed8f03
1 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,10 +104,36 @@ struct impl {
unsigned int warned:1; unsigned int warned:1;
unsigned int driver:1; unsigned int driver:1;
int in_enum_sync;
}; };
/** \endcond */ /** \endcond */
static int node_enum_params_sync(struct impl *impl, struct spa_node *node,
uint32_t id, uint32_t *index, const struct spa_pod *filter,
struct spa_pod **param, struct spa_pod_builder *builder)
{
int res;
impl->in_enum_sync++;
res = spa_node_enum_params_sync(node, id, index, filter, param, builder);
impl->in_enum_sync--;
return res;
}
static int node_port_enum_params_sync(struct impl *impl, struct spa_node *node,
enum spa_direction direction, uint32_t port_id,
uint32_t id, uint32_t *index, const struct spa_pod *filter,
struct spa_pod **param, struct spa_pod_builder *builder)
{
int res;
impl->in_enum_sync++;
res = spa_node_port_enum_params_sync(node, direction, port_id, id, index,
filter, param, builder);
impl->in_enum_sync--;
return res;
}
static int follower_enum_params(struct impl *this, static int follower_enum_params(struct impl *this,
uint32_t id, uint32_t id,
uint32_t idx, uint32_t idx,
@ -118,14 +144,14 @@ static int follower_enum_params(struct impl *this,
int res; int res;
if (result->next < 0x100000 && if (result->next < 0x100000 &&
this->follower != this->target) { this->follower != this->target) {
if ((res = spa_node_enum_params_sync(this->target, if ((res = node_enum_params_sync(this, this->target,
id, &result->next, filter, &result->param, builder)) == 1) id, &result->next, filter, &result->param, builder)) == 1)
return res; return res;
result->next = 0x100000; result->next = 0x100000;
} }
if (result->next < 0x200000 && this->follower_params_flags[idx] & SPA_PARAM_INFO_READ) { if (result->next < 0x200000 && this->follower_params_flags[idx] & SPA_PARAM_INFO_READ) {
result->next &= 0xfffff; result->next &= 0xfffff;
if ((res = spa_node_enum_params_sync(this->follower, if ((res = node_enum_params_sync(this, this->follower,
id, &result->next, filter, &result->param, builder)) == 1) { id, &result->next, filter, &result->param, builder)) == 1) {
result->next |= 0x100000; result->next |= 0x100000;
return res; return res;
@ -224,7 +250,7 @@ next:
case SPA_PARAM_Format: case SPA_PARAM_Format:
case SPA_PARAM_Latency: case SPA_PARAM_Latency:
case SPA_PARAM_Tag: case SPA_PARAM_Tag:
res = spa_node_port_enum_params_sync(this->follower, res = node_port_enum_params_sync(this, this->follower,
this->direction, 0, this->direction, 0,
id, &result.next, filter, &result.param, &b.b); id, &result.next, filter, &result.param, &b.b);
break; break;
@ -375,7 +401,7 @@ static int debug_params(struct impl *this, struct spa_node *node,
state = 0; state = 0;
while (true) { while (true) {
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
res = spa_node_port_enum_params_sync(node, res = node_port_enum_params_sync(this, node,
direction, port_id, direction, port_id,
id, &state, id, &state,
NULL, &param, &b); NULL, &param, &b);
@ -417,7 +443,7 @@ static int negotiate_buffers(struct impl *this)
state = 0; state = 0;
param = NULL; param = NULL;
if ((res = spa_node_port_enum_params_sync(this->follower, if ((res = node_port_enum_params_sync(this, this->follower,
this->direction, 0, this->direction, 0,
SPA_PARAM_Buffers, &state, SPA_PARAM_Buffers, &state,
param, &param, &b)) < 0) { param, &param, &b)) < 0) {
@ -431,7 +457,7 @@ static int negotiate_buffers(struct impl *this)
} }
state = 0; state = 0;
if ((res = spa_node_port_enum_params_sync(this->target, if ((res = node_port_enum_params_sync(this, this->target,
SPA_DIRECTION_REVERSE(this->direction), 0, SPA_DIRECTION_REVERSE(this->direction), 0,
SPA_PARAM_Buffers, &state, SPA_PARAM_Buffers, &state,
param, &param, &b)) != 1) { param, &param, &b)) != 1) {
@ -546,7 +572,7 @@ static int configure_format(struct impl *this, uint32_t flags, const struct spa_
/* format was changed to nearest compatible format */ /* format was changed to nearest compatible format */
if ((res = spa_node_port_enum_params_sync(this->follower, if ((res = node_port_enum_params_sync(this, this->follower,
this->direction, 0, this->direction, 0,
SPA_PARAM_Format, &state, SPA_PARAM_Format, &state,
NULL, &fmt, &b)) != 1) NULL, &fmt, &b)) != 1)
@ -614,7 +640,7 @@ static int recalc_latency(struct impl *this, struct spa_node *src, enum spa_dire
while (true) { while (true) {
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
if ((res = spa_node_port_enum_params_sync(src, if ((res = node_port_enum_params_sync(this, src,
direction, port_id, SPA_PARAM_Latency, direction, port_id, SPA_PARAM_Latency,
&index, NULL, &param, &b)) != 1) { &index, NULL, &param, &b)) != 1) {
param = NULL; param = NULL;
@ -655,7 +681,7 @@ static int recalc_tag(struct impl *this, struct spa_node *src, enum spa_directio
while (true) { while (true) {
void *tag_state = NULL; void *tag_state = NULL;
spa_pod_builder_reset(&b.b, &state); spa_pod_builder_reset(&b.b, &state);
if ((res = spa_node_port_enum_params_sync(src, if ((res = node_port_enum_params_sync(this, src,
direction, port_id, SPA_PARAM_Tag, direction, port_id, SPA_PARAM_Tag,
&index, NULL, &param, &b.b)) != 1) { &index, NULL, &param, &b.b)) != 1) {
param = NULL; param = NULL;
@ -916,13 +942,13 @@ static int negotiate_format(struct impl *this)
/* first try the ideal converter format, which is likely passthrough */ /* first try the ideal converter format, which is likely passthrough */
tstate = 0; tstate = 0;
fres = spa_node_port_enum_params_sync(this->target, fres = node_port_enum_params_sync(this, this->target,
SPA_DIRECTION_REVERSE(this->direction), 0, SPA_DIRECTION_REVERSE(this->direction), 0,
SPA_PARAM_EnumFormat, &tstate, SPA_PARAM_EnumFormat, &tstate,
NULL, &format, &b); NULL, &format, &b);
if (fres == 1) { if (fres == 1) {
fstate = 0; fstate = 0;
res = spa_node_port_enum_params_sync(this->follower, res = node_port_enum_params_sync(this, this->follower,
this->direction, 0, this->direction, 0,
SPA_PARAM_EnumFormat, &fstate, SPA_PARAM_EnumFormat, &fstate,
format, &format, &b); format, &format, &b);
@ -933,7 +959,7 @@ static int negotiate_format(struct impl *this)
/* then try something the follower can accept */ /* then try something the follower can accept */
for (fstate = 0;;) { for (fstate = 0;;) {
format = NULL; format = NULL;
res = spa_node_port_enum_params_sync(this->follower, res = node_port_enum_params_sync(this, this->follower,
this->direction, 0, this->direction, 0,
SPA_PARAM_EnumFormat, &fstate, SPA_PARAM_EnumFormat, &fstate,
NULL, &format, &b); NULL, &format, &b);
@ -944,7 +970,7 @@ static int negotiate_format(struct impl *this)
break; break;
tstate = 0; tstate = 0;
fres = spa_node_port_enum_params_sync(this->target, fres = node_port_enum_params_sync(this, this->target,
SPA_DIRECTION_REVERSE(this->direction), 0, SPA_DIRECTION_REVERSE(this->direction), 0,
SPA_PARAM_EnumFormat, &tstate, SPA_PARAM_EnumFormat, &tstate,
format, &format, &b); format, &format, &b);
@ -1203,7 +1229,7 @@ static void convert_result(void *data, int seq, int res, uint32_t type, const vo
{ {
struct impl *this = data; struct impl *this = data;
if (this->target == this->follower) if (this->target == this->follower || this->in_enum_sync)
return; return;
spa_log_trace(this->log, "%p: result %d %d", this, seq, res); spa_log_trace(this->log, "%p: result %d %d", this, seq, res);
@ -1380,7 +1406,7 @@ static void follower_result(void *data, int seq, int res, uint32_t type, const v
{ {
struct impl *this = data; struct impl *this = data;
if (this->target != this->follower) if (this->target != this->follower || this->in_enum_sync)
return; return;
spa_log_trace(this->log, "%p: result %d %d", this, seq, res); spa_log_trace(this->log, "%p: result %d %d", this, seq, res);
@ -1892,7 +1918,7 @@ static int do_auto_port_config(struct impl *this, const char *str)
struct spa_audio_info info = { 0, }; struct spa_audio_info info = { 0, };
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
if ((res = spa_node_port_enum_params_sync(this->follower, if ((res = node_port_enum_params_sync(this, this->follower,
this->direction, 0, this->direction, 0,
SPA_PARAM_EnumFormat, &state, SPA_PARAM_EnumFormat, &state,
NULL, &param, &b)) != 1) NULL, &param, &b)) != 1)