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

module-echo-cancel: Don't call _run() when inactive

Browse source 
Call _activate() in the aec spa plugin before both capture and sink
streams are started and call _deactivate() after both capture and sink
streams are stopped, to make sure _run() is not called while the spa
plugin is inactive.
This commit is contained in:
Jonas Holmberg 2024-03-25 15:35:04 +01:00 • committed by Wim Taymans
parent ddfe3daa22
commit b868ba1f6f
1 changed files with 74 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -526,17 +526,38 @@ static void capture_state_changed(void *data, enum pw_stream_state old,
enum pw_stream_state state, const char *error) enum pw_stream_state state, const char *error)
{ {
struct impl *impl = data; struct impl *impl = data;
int res;
switch (state) { switch (state) {
case PW_STREAM_STATE_PAUSED: case PW_STREAM_STATE_PAUSED:
pw_stream_flush(impl->source, false); pw_stream_flush(impl->source, false);
pw_stream_flush(impl->capture, false); pw_stream_flush(impl->capture, false);
if (old == PW_STREAM_STATE_STREAMING) {
if (pw_stream_get_state(impl->sink, NULL) != PW_STREAM_STATE_STREAMING) {
pw_log_debug("%p: deactivate %s", impl, impl->aec->name);
res = spa_audio_aec_deactivate(impl->aec);
if (res < 0 && res != -EOPNOTSUPP) {
pw_log_error("aec plugin %s deactivate failed: %s", impl->aec->name, spa_strerror(res));
}
}
}
break;
case PW_STREAM_STATE_STREAMING:
if (pw_stream_get_state(impl->sink, NULL) == PW_STREAM_STATE_STREAMING) {
pw_log_debug("%p: activate %s", impl, impl->aec->name);
res = spa_audio_aec_activate(impl->aec);
if (res < 0 && res != -EOPNOTSUPP) {
pw_log_error("aec plugin %s activate failed: %s", impl->aec->name, spa_strerror(res));
}
}
break; break;
case PW_STREAM_STATE_UNCONNECTED: case PW_STREAM_STATE_UNCONNECTED:
pw_log_info("%p: input unconnected", impl); pw_log_info("%p: capture unconnected", impl);
pw_impl_module_schedule_destroy(impl->module); pw_impl_module_schedule_destroy(impl->module);
break; break;
case PW_STREAM_STATE_ERROR: case PW_STREAM_STATE_ERROR:
pw_log_info("%p: input error: %s", impl, error); pw_log_info("%p: capture error: %s", impl, error);
break; break;
default: default:
break; break;
@ -547,34 +568,18 @@ static void source_state_changed(void *data, enum pw_stream_state old,
enum pw_stream_state state, const char *error) enum pw_stream_state state, const char *error)
{ {
struct impl *impl = data; struct impl *impl = data;
int res;
switch (state) { switch (state) {
case PW_STREAM_STATE_PAUSED: case PW_STREAM_STATE_PAUSED:
pw_stream_flush(impl->source, false); pw_stream_flush(impl->source, false);
pw_stream_flush(impl->capture, false); pw_stream_flush(impl->capture, false);
if (old == PW_STREAM_STATE_STREAMING) {
pw_log_debug("%p: deactivate %s", impl, impl->aec->name);
res = spa_audio_aec_deactivate(impl->aec);
if (res < 0 && res != -EOPNOTSUPP) {
pw_log_error("aec plugin %s deactivate failed: %s", impl->aec->name, spa_strerror(res));
}
}
break;
case PW_STREAM_STATE_STREAMING:
pw_log_debug("%p: activate %s", impl, impl->aec->name);
res = spa_audio_aec_activate(impl->aec);
if (res < 0 && res != -EOPNOTSUPP) {
pw_log_error("aec plugin %s activate failed: %s", impl->aec->name, spa_strerror(res));
}
break; break;
case PW_STREAM_STATE_UNCONNECTED: case PW_STREAM_STATE_UNCONNECTED:
pw_log_info("%p: input unconnected", impl); pw_log_info("%p: source unconnected", impl);
pw_impl_module_schedule_destroy(impl->module); pw_impl_module_schedule_destroy(impl->module);
break; break;
case PW_STREAM_STATE_ERROR: case PW_STREAM_STATE_ERROR:
pw_log_info("%p: input error: %s", impl, error); pw_log_info("%p: source error: %s", impl, error);
break; break;
default: default:
break; break;
@ -745,7 +750,7 @@ static const struct pw_stream_events source_events = {
.param_changed = input_param_changed .param_changed = input_param_changed
}; };
static void output_state_changed(void *data, enum pw_stream_state old, static void playback_state_changed(void *data, enum pw_stream_state old,
enum pw_stream_state state, const char *error) enum pw_stream_state state, const char *error)
{ {
struct impl *impl = data; struct impl *impl = data;
@ -759,11 +764,55 @@ static void output_state_changed(void *data, enum pw_stream_state old,
} }
break; break;
case PW_STREAM_STATE_UNCONNECTED: case PW_STREAM_STATE_UNCONNECTED:
pw_log_info("%p: output unconnected", impl); pw_log_info("%p: playback unconnected", impl);
pw_impl_module_schedule_destroy(impl->module); pw_impl_module_schedule_destroy(impl->module);
break; break;
case PW_STREAM_STATE_ERROR: case PW_STREAM_STATE_ERROR:
pw_log_info("%p: output error: %s", impl, error); pw_log_info("%p: playback error: %s", impl, error);
break;
default:
break;
}
}
static void sink_state_changed(void *data, enum pw_stream_state old,
enum pw_stream_state state, const char *error)
{
struct impl *impl = data;
int res;
switch (state) {
case PW_STREAM_STATE_PAUSED:
pw_stream_flush(impl->sink, false);
if (impl->playback != NULL)
pw_stream_flush(impl->playback, false);
if (old == PW_STREAM_STATE_STREAMING) {
impl->current_delay = 0;
if (pw_stream_get_state(impl->capture, NULL) != PW_STREAM_STATE_STREAMING) {
pw_log_debug("%p: deactivate %s", impl, impl->aec->name);
res = spa_audio_aec_deactivate(impl->aec);
if (res < 0 && res != -EOPNOTSUPP) {
pw_log_error("aec plugin %s deactivate failed: %s", impl->aec->name, spa_strerror(res));
}
}
}
break;
case PW_STREAM_STATE_STREAMING:
if (pw_stream_get_state(impl->capture, NULL) == PW_STREAM_STATE_STREAMING) {
pw_log_debug("%p: activate %s", impl, impl->aec->name);
res = spa_audio_aec_activate(impl->aec);
if (res < 0 && res != -EOPNOTSUPP) {
pw_log_error("aec plugin %s activate failed: %s", impl->aec->name, spa_strerror(res));
}
}
break;
case PW_STREAM_STATE_UNCONNECTED:
pw_log_info("%p: sink unconnected", impl);
pw_impl_module_schedule_destroy(impl->module);
break;
case PW_STREAM_STATE_ERROR:
pw_log_info("%p: sink error: %s", impl, error);
break; break;
default: default:
break; break;
@ -889,14 +938,14 @@ static void playback_destroy(void *d)
static const struct pw_stream_events playback_events = { static const struct pw_stream_events playback_events = {
PW_VERSION_STREAM_EVENTS, PW_VERSION_STREAM_EVENTS,
.destroy = playback_destroy, .destroy = playback_destroy,
.state_changed = output_state_changed, .state_changed = playback_state_changed,
.param_changed = output_param_changed .param_changed = output_param_changed
}; };
static const struct pw_stream_events sink_events = { static const struct pw_stream_events sink_events = {
PW_VERSION_STREAM_EVENTS, PW_VERSION_STREAM_EVENTS,
.destroy = sink_destroy, .destroy = sink_destroy,
.process = sink_process, .process = sink_process,
.state_changed = output_state_changed, .state_changed = sink_state_changed,
.param_changed = output_param_changed .param_changed = output_param_changed
}; };