mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules: flush and reset state in paused

Browse source 
So that we don't end up with previous data when we resume.

See #1660
This commit is contained in:
Wim Taymans 2021-10-13 18:37:02 +02:00
parent 6e818480c1
commit 64d6ff4184
2 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/modules/module-filter-chain.c
View file

@ -587,6 +587,23 @@ static void param_latency_changed(struct impl *impl, const struct spa_pod *param
pw_stream_update_params(impl->playback, params, 1); pw_stream_update_params(impl->playback, params, 1);
} }
static void state_changed(void *data, enum pw_stream_state old,
enum pw_stream_state state, const char *error)
{
struct impl *impl = data;
struct graph *graph = &impl->graph;
switch (state) {
case PW_STREAM_STATE_PAUSED:
pw_stream_flush(impl->playback, false);
pw_stream_flush(impl->capture, false);
graph_reset(graph);
break;
default:
break;
}
}
static void param_changed(void *data, uint32_t id, const struct spa_pod *param) static void param_changed(void *data, uint32_t id, const struct spa_pod *param)
{ {
struct impl *impl = data; struct impl *impl = data;
@ -611,6 +628,7 @@ static const struct pw_stream_events in_stream_events = {
PW_VERSION_STREAM_EVENTS, PW_VERSION_STREAM_EVENTS,
.destroy = capture_destroy, .destroy = capture_destroy,
.process = capture_process, .process = capture_process,
.state_changed = state_changed,
.param_changed = param_changed .param_changed = param_changed
}; };
@ -624,6 +642,7 @@ static void playback_destroy(void *d)
static const struct pw_stream_events out_stream_events = { static const struct pw_stream_events out_stream_events = {
PW_VERSION_STREAM_EVENTS, PW_VERSION_STREAM_EVENTS,
.destroy = playback_destroy, .destroy = playback_destroy,
.state_changed = state_changed,
.param_changed = param_changed .param_changed = param_changed
}; };

17
src/modules/module-loopback.c
View file

@ -184,6 +184,20 @@ static void param_latency_changed(struct impl *impl, const struct spa_pod *param
pw_stream_update_params(other, params, 1); pw_stream_update_params(other, params, 1);
} }
static void stream_state_changed(void *data, enum pw_stream_state old,
enum pw_stream_state state, const char *error)
{
struct impl *impl = data;
switch (state) {
case PW_STREAM_STATE_PAUSED:
pw_stream_flush(impl->playback, false);
pw_stream_flush(impl->capture, false);
break;
default:
break;
}
}
static void capture_param_changed(void *data, uint32_t id, const struct spa_pod *param) static void capture_param_changed(void *data, uint32_t id, const struct spa_pod *param)
{ {
struct impl *impl = data; struct impl *impl = data;
@ -199,6 +213,7 @@ static const struct pw_stream_events in_stream_events = {
PW_VERSION_STREAM_EVENTS, PW_VERSION_STREAM_EVENTS,
.destroy = capture_destroy, .destroy = capture_destroy,
.process = capture_process, .process = capture_process,
.state_changed = stream_state_changed,
.param_changed = capture_param_changed, .param_changed = capture_param_changed,
}; };
@ -209,6 +224,7 @@ static void playback_destroy(void *d)
impl->playback = NULL; impl->playback = NULL;
} }
static void playback_param_changed(void *data, uint32_t id, const struct spa_pod *param) static void playback_param_changed(void *data, uint32_t id, const struct spa_pod *param)
{ {
struct impl *impl = data; struct impl *impl = data;
@ -222,6 +238,7 @@ static void playback_param_changed(void *data, uint32_t id, const struct spa_pod
static const struct pw_stream_events out_stream_events = { static const struct pw_stream_events out_stream_events = {
PW_VERSION_STREAM_EVENTS, PW_VERSION_STREAM_EVENTS,
.destroy = playback_destroy, .destroy = playback_destroy,
.state_changed = stream_state_changed,
.param_changed = playback_param_changed, .param_changed = playback_param_changed,
}; };