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

audioadapter: improve PortConfig enumeration

Browse source 
When in passthrough mode and there is no converter, simply return
our own PortConfig parameter with our direction and passthrough mode.

Otherwise, use the PortConfig from the converter but filter out only the
PortConfig that matches our direction.

This fixes enumeration of PortConfig on the adapter.
This commit is contained in:
Wim Taymans 2022-12-05 11:45:44 +01:00
parent 5bda4b6a57
commit 03f9466c5d
1 changed files with 39 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,6 +138,27 @@ static int follower_enum_params(struct impl *this,
return 0; return 0;
} }
static int convert_enum_port_config(struct impl *this,
int seq, uint32_t id, uint32_t start, uint32_t num,
const struct spa_pod *filter, struct spa_pod_builder *builder)
{
struct spa_pod *f1, *f2 = NULL;
int res;
f1 = spa_pod_builder_add_object(builder,
SPA_TYPE_OBJECT_ParamPortConfig, id,
SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(this->direction));
if (filter) {
if ((res = spa_pod_filter(builder, &f2, f1, filter)) < 0)
return res;
}
else {
f2 = f1;
}
return spa_node_enum_params(this->convert, seq, id, start, num, f2);
}
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)
@ -163,9 +184,25 @@ next:
switch (id) { switch (id) {
case SPA_PARAM_EnumPortConfig: case SPA_PARAM_EnumPortConfig:
return convert_enum_port_config(this, seq, id, start, num, filter, &b.b);
case SPA_PARAM_PortConfig: case SPA_PARAM_PortConfig:
res = spa_node_enum_params(this->convert, seq, id, start, num, filter); if (this->passthrough) {
return res; switch (result.index) {
case 0:
result.param = spa_pod_builder_add_object(&b.b,
SPA_TYPE_OBJECT_ParamPortConfig, id,
SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(this->direction),
SPA_PARAM_PORT_CONFIG_mode, SPA_POD_Id(
SPA_PARAM_PORT_CONFIG_MODE_passthrough));
result.next++;
break;
default:
return 0;
}
} else {
return convert_enum_port_config(this, seq, id, start, num, filter, &b.b);
}
break;
case SPA_PARAM_PropInfo: case SPA_PARAM_PropInfo:
res = follower_enum_params(this, res = follower_enum_params(this,
id, IDX_PropInfo, &result, filter, &b.b); id, IDX_PropInfo, &result, filter, &b.b);