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

audioconvert: track and emit all volume

Browse source 
Let both channelmix and merger remember all volumes so that they can
be emited when they change.
This commit is contained in:
Wim Taymans 2021-04-29 15:23:33 +02:00
parent 5bf2144438
commit 664df03bbb
2 changed files with 69 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

38
spa/plugins/audioconvert/channelmix.c
View file

@ -80,6 +80,7 @@ struct props {
uint32_t channel_map[SPA_AUDIO_MAX_CHANNELS]; uint32_t channel_map[SPA_AUDIO_MAX_CHANNELS];
struct volumes channel; struct volumes channel;
struct volumes soft; struct volumes soft;
struct volumes monitor;
unsigned int have_soft_volume:1; unsigned int have_soft_volume:1;
}; };
@ -92,6 +93,7 @@ static void props_reset(struct props *props)
props->channel_map[i] = SPA_AUDIO_CHANNEL_UNKNOWN; props->channel_map[i] = SPA_AUDIO_CHANNEL_UNKNOWN;
init_volumes(&props->channel); init_volumes(&props->channel);
init_volumes(&props->soft); init_volumes(&props->soft);
init_volumes(&props->monitor);
} }
struct buffer { struct buffer {
@ -258,6 +260,7 @@ static int remap_volumes(struct impl *this, const struct spa_audio_info *info)
SPA_SWAP(p->channel_map[i], p->channel_map[j]); SPA_SWAP(p->channel_map[i], p->channel_map[j]);
SPA_SWAP(p->channel.volumes[i], p->channel.volumes[j]); SPA_SWAP(p->channel.volumes[i], p->channel.volumes[j]);
SPA_SWAP(p->soft.volumes[i], p->soft.volumes[j]); SPA_SWAP(p->soft.volumes[i], p->soft.volumes[j]);
SPA_SWAP(p->monitor.volumes[i], p->monitor.volumes[j]);
} }
break; break;
} }
@ -272,6 +275,8 @@ static int remap_volumes(struct impl *this, const struct spa_audio_info *info)
fix_volumes(&p->channel, target); fix_volumes(&p->channel, target);
if (p->soft.n_volumes != target) if (p->soft.n_volumes != target)
fix_volumes(&p->soft, target); fix_volumes(&p->soft, target);
if (p->monitor.n_volumes != target)
fix_volumes(&p->monitor, target);
return 1; return 1;
} }
@ -429,6 +434,21 @@ static int impl_node_enum_params(void *object, int seq,
SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Float(p->volume, 0.0, 10.0), SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Float(p->volume, 0.0, 10.0),
SPA_PROP_INFO_container, SPA_POD_Id(SPA_TYPE_Array)); SPA_PROP_INFO_container, SPA_POD_Id(SPA_TYPE_Array));
break; break;
case 5:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_PropInfo, id,
SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_monitorMute),
SPA_PROP_INFO_name, SPA_POD_String("Monitor Mute"),
SPA_PROP_INFO_type, SPA_POD_CHOICE_Bool(p->monitor.mute));
break;
case 6:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_PropInfo, id,
SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_monitorVolumes),
SPA_PROP_INFO_name, SPA_POD_String("Monitor Volumes"),
SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Float(p->volume, 0.0, 10.0),
SPA_PROP_INFO_container, SPA_POD_Id(SPA_TYPE_Array));
break;
default: default:
return 0; return 0;
} }
@ -452,10 +472,16 @@ static int impl_node_enum_params(void *object, int seq,
SPA_TYPE_Id, SPA_TYPE_Id,
p->n_channels, p->n_channels,
p->channel_map), p->channel_map),
SPA_PROP_softMute, SPA_POD_Bool(p->soft.mute),
SPA_PROP_softVolumes, SPA_POD_Array(sizeof(float), SPA_PROP_softVolumes, SPA_POD_Array(sizeof(float),
SPA_TYPE_Float, SPA_TYPE_Float,
p->soft.n_volumes, p->soft.n_volumes,
p->soft.volumes)); p->soft.volumes),
SPA_PROP_monitorMute, SPA_POD_Bool(p->monitor.mute),
SPA_PROP_monitorVolumes, SPA_POD_Array(sizeof(float),
SPA_TYPE_Float,
p->monitor.n_volumes,
p->monitor.volumes));
break; break;
default: default:
return 0; return 0;
@ -517,6 +543,15 @@ static int apply_props(struct impl *this, const struct spa_pod *param)
p->have_soft_volume = true; p->have_soft_volume = true;
} }
break; break;
case SPA_PROP_monitorMute:
if (spa_pod_get_bool(&prop->value, &p->monitor.mute) == 0)
changed++;
break;
case SPA_PROP_monitorVolumes:
if ((p->monitor.n_volumes = spa_pod_copy_array(&prop->value, SPA_TYPE_Float,
p->monitor.volumes, SPA_AUDIO_MAX_CHANNELS)) > 0)
changed++;
break;
default: default:
break; break;
} }
@ -1361,6 +1396,7 @@ impl_init(const struct spa_handle_factory *factory,
} }
this->props.channel.n_volumes = this->props.n_channels; this->props.channel.n_volumes = this->props.n_channels;
this->props.soft.n_volumes = this->props.n_channels; this->props.soft.n_volumes = this->props.n_channels;
this->props.monitor.n_volumes = this->props.n_channels;
this->node.iface = SPA_INTERFACE_INIT( this->node.iface = SPA_INTERFACE_INIT(
SPA_TYPE_INTERFACE_Node, SPA_TYPE_INTERFACE_Node,

32
spa/plugins/audioconvert/merger.c
View file

@ -80,6 +80,7 @@ struct props {
uint32_t n_channels; uint32_t n_channels;
uint32_t channel_map[SPA_AUDIO_MAX_CHANNELS]; uint32_t channel_map[SPA_AUDIO_MAX_CHANNELS];
struct volumes channel; struct volumes channel;
struct volumes soft;
struct volumes monitor; struct volumes monitor;
}; };
@ -91,6 +92,7 @@ static void props_reset(struct props *props)
for (i = 0; i < SPA_AUDIO_MAX_CHANNELS; i++) for (i = 0; i < SPA_AUDIO_MAX_CHANNELS; i++)
props->channel_map[i] = SPA_AUDIO_CHANNEL_UNKNOWN; props->channel_map[i] = SPA_AUDIO_CHANNEL_UNKNOWN;
init_volumes(&props->channel); init_volumes(&props->channel);
init_volumes(&props->soft);
init_volumes(&props->monitor); init_volumes(&props->monitor);
} }
@ -326,6 +328,21 @@ static int impl_node_enum_params(void *object, int seq,
SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Float(p->volume, 0.0, 10.0), SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Float(p->volume, 0.0, 10.0),
SPA_PROP_INFO_container, SPA_POD_Id(SPA_TYPE_Array)); SPA_PROP_INFO_container, SPA_POD_Id(SPA_TYPE_Array));
break; break;
case 6:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_PropInfo, id,
SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_softMute),
SPA_PROP_INFO_name, SPA_POD_String("Soft Mute"),
SPA_PROP_INFO_type, SPA_POD_CHOICE_Bool(p->soft.mute));
break;
case 7:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_PropInfo, id,
SPA_PROP_INFO_id, SPA_POD_Id(SPA_PROP_softVolumes),
SPA_PROP_INFO_name, SPA_POD_String("Soft Volumes"),
SPA_PROP_INFO_type, SPA_POD_CHOICE_RANGE_Float(p->volume, 0.0, 10.0),
SPA_PROP_INFO_container, SPA_POD_Id(SPA_TYPE_Array));
break;
default: default:
return 0; return 0;
} }
@ -350,6 +367,11 @@ static int impl_node_enum_params(void *object, int seq,
SPA_TYPE_Id, SPA_TYPE_Id,
p->n_channels, p->n_channels,
p->channel_map), p->channel_map),
SPA_PROP_softMute, SPA_POD_Bool(p->soft.mute),
SPA_PROP_softVolumes, SPA_POD_Array(sizeof(float),
SPA_TYPE_Float,
p->soft.n_volumes,
p->soft.volumes),
SPA_PROP_monitorMute, SPA_POD_Bool(p->monitor.mute), SPA_PROP_monitorMute, SPA_POD_Bool(p->monitor.mute),
SPA_PROP_monitorVolumes, SPA_POD_Array(sizeof(float), SPA_PROP_monitorVolumes, SPA_POD_Array(sizeof(float),
SPA_TYPE_Float, SPA_TYPE_Float,
@ -421,6 +443,15 @@ static int apply_props(struct impl *this, const struct spa_pod *param)
p->channel_map, SPA_AUDIO_MAX_CHANNELS)) > 0) p->channel_map, SPA_AUDIO_MAX_CHANNELS)) > 0)
changed++; changed++;
break; break;
case SPA_PROP_softMute:
if (spa_pod_get_bool(&prop->value, &p->soft.mute) == 0)
changed++;
break;
case SPA_PROP_softVolumes:
if ((p->soft.n_volumes = spa_pod_copy_array(&prop->value, SPA_TYPE_Float,
p->soft.volumes, SPA_AUDIO_MAX_CHANNELS)) > 0)
changed++;
break;
case SPA_PROP_monitorMute: case SPA_PROP_monitorMute:
if (spa_pod_get_bool(&prop->value, &p->monitor.mute) == 0) if (spa_pod_get_bool(&prop->value, &p->monitor.mute) == 0)
changed++; changed++;
@ -516,6 +547,7 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
this->props.channel_map[i] = info.info.raw.position[i]; this->props.channel_map[i] = info.info.raw.position[i];
this->props.channel.n_volumes = this->port_count; this->props.channel.n_volumes = this->port_count;
this->props.monitor.n_volumes = this->port_count; this->props.monitor.n_volumes = this->port_count;
this->props.soft.n_volumes = this->port_count;
this->props.n_channels = this->port_count; this->props.n_channels = this->port_count;
for (i = 0; i < this->port_count; i++) { for (i = 0; i < this->port_count; i++) {