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

module-echo-cancel: put audio.position on properties

Browse source 
So that a default channel layout is set and the volume can be set before
the streams are negotiated.
This commit is contained in:
Wim Taymans 2022-04-13 11:15:10 +02:00
parent df6fb25e03
commit 78b1c4c2e8
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-echo-cancel.c
View file

@ -610,6 +610,10 @@ static int setup_streams(struct impl *impl)
pw_properties_set(props, PW_KEY_NODE_LATENCY, str); pw_properties_set(props, PW_KEY_NODE_LATENCY, str);
else if (impl->aec->latency) else if (impl->aec->latency)
pw_properties_set(props, PW_KEY_NODE_LATENCY, impl->aec->latency); pw_properties_set(props, PW_KEY_NODE_LATENCY, impl->aec->latency);
if ((str = pw_properties_get(impl->source_props, SPA_KEY_AUDIO_CHANNELS)) != NULL)
pw_properties_set(props, SPA_KEY_AUDIO_CHANNELS, str);
if ((str = pw_properties_get(impl->source_props, SPA_KEY_AUDIO_POSITION)) != NULL)
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, str);
impl->capture = pw_stream_new(impl->core, impl->capture = pw_stream_new(impl->core,
"Echo-Cancel Capture", props); "Echo-Cancel Capture", props);
@ -643,6 +647,10 @@ static int setup_streams(struct impl *impl)
pw_properties_set(props, PW_KEY_NODE_LATENCY, str); pw_properties_set(props, PW_KEY_NODE_LATENCY, str);
else if (impl->aec->latency) else if (impl->aec->latency)
pw_properties_set(props, PW_KEY_NODE_LATENCY, impl->aec->latency); pw_properties_set(props, PW_KEY_NODE_LATENCY, impl->aec->latency);
if ((str = pw_properties_get(impl->sink_props, SPA_KEY_AUDIO_CHANNELS)) != NULL)
pw_properties_set(props, SPA_KEY_AUDIO_CHANNELS, str);
if ((str = pw_properties_get(impl->sink_props, SPA_KEY_AUDIO_POSITION)) != NULL)
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, str);
impl->playback = pw_stream_new(impl->core, impl->playback = pw_stream_new(impl->core,
"Echo-Cancel Playback", props); "Echo-Cancel Playback", props);
@ -1024,6 +1032,8 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
copy_props(impl, props, PW_KEY_NODE_LINK_GROUP); copy_props(impl, props, PW_KEY_NODE_LINK_GROUP);
copy_props(impl, props, PW_KEY_NODE_VIRTUAL); copy_props(impl, props, PW_KEY_NODE_VIRTUAL);
copy_props(impl, props, PW_KEY_NODE_LATENCY); copy_props(impl, props, PW_KEY_NODE_LATENCY);
copy_props(impl, props, SPA_KEY_AUDIO_CHANNELS);
copy_props(impl, props, SPA_KEY_AUDIO_POSITION);
impl->max_buffer_size = pw_properties_get_uint32(props,"buffer.max_size", MAX_BUFSIZE_MS); impl->max_buffer_size = pw_properties_get_uint32(props,"buffer.max_size", MAX_BUFSIZE_MS);