mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-03-07 04:34:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: audioadapter: Explicitly track port mode

Browse source 
Will be useful for convert-mode-specific EnumFormats.
This commit is contained in:
Arun Raghavan 2025-01-24 15:20:45 -05:00
parent 50437fb4eb
commit beb81e8f4e
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,7 +98,7 @@ struct impl {
unsigned int started:1; unsigned int started:1;
unsigned int ready:1; unsigned int ready:1;
unsigned int async:1; unsigned int async:1;
unsigned int passthrough:1; enum spa_param_port_config_mode mode;
unsigned int follower_removing:1; unsigned int follower_removing:1;
unsigned int in_recalc; unsigned int in_recalc;
@ -216,7 +216,7 @@ next:
case SPA_PARAM_EnumPortConfig: case SPA_PARAM_EnumPortConfig:
return convert_enum_port_config(this, seq, id, start, num, filter, &b.b); return convert_enum_port_config(this, seq, id, start, num, filter, &b.b);
case SPA_PARAM_PortConfig: case SPA_PARAM_PortConfig:
if (this->passthrough) { if (this->mode == SPA_PARAM_PORT_CONFIG_MODE_passthrough) {
switch (result.index) { switch (result.index) {
case 0: case 0:
result.param = spa_pod_builder_add_object(&b.b, result.param = spa_pod_builder_add_object(&b.b,
@ -709,7 +709,7 @@ static int reconfigure_mode(struct impl *this, enum spa_param_port_config_mode m
if (!passthrough && this->convert == NULL) if (!passthrough && this->convert == NULL)
return -ENOTSUP; return -ENOTSUP;
if (this->passthrough != passthrough) { if (this->mode != mode) {
if (passthrough) { if (passthrough) {
/* remove converter split/merge ports */ /* remove converter split/merge ports */
configure_convert(this, SPA_PARAM_PORT_CONFIG_MODE_none); configure_convert(this, SPA_PARAM_PORT_CONFIG_MODE_none);
@ -729,8 +729,8 @@ static int reconfigure_mode(struct impl *this, enum spa_param_port_config_mode m
if ((res = configure_format(this, SPA_NODE_PARAM_FLAG_NEAREST, format)) < 0) if ((res = configure_format(this, SPA_NODE_PARAM_FLAG_NEAREST, format)) < 0)
return res; return res;
if (this->passthrough != passthrough) { if (this->mode != mode) {
this->passthrough = passthrough; this->mode = mode;
if (passthrough) { if (passthrough) {
/* add follower ports */ /* add follower ports */
spa_zero(l); spa_zero(l);
@ -2074,10 +2074,11 @@ impl_init(const struct spa_handle_factory *factory,
if (this->convert == NULL) { if (this->convert == NULL) {
this->target = this->follower; this->target = this->follower;
this->passthrough = true; this->mode = SPA_PARAM_PORT_CONFIG_MODE_passthrough;
} else { } else {
this->target = this->convert; this->target = this->convert;
this->passthrough = false; /* the actual mode is selected below */
this->mode = SPA_PARAM_PORT_CONFIG_MODE_none;
} }
this->info_all = SPA_NODE_CHANGE_MASK_FLAGS | this->info_all = SPA_NODE_CHANGE_MASK_FLAGS |