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

stream: improve drain

Browse source 
Make sure we safely stop draining the stream by using the loop lock.

Always stop draining when we change the state of the stream.
The idea is that you either wait for the drain signal or cancel the
pending drain early with a new set_active() call.
This commit is contained in:
Wim Taymans 2025-06-25 13:07:16 +02:00
parent a9cece3c2e
commit c045767252
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pipewire/stream.c
View file

@ -2370,6 +2370,18 @@ const struct pw_stream_control *pw_stream_get_control(struct pw_stream *stream,
return NULL; return NULL;
} }
static int
do_stop_drain(struct spa_loop *loop, bool async, uint32_t seq,
const void *data, size_t size, void *user_data)
{
struct stream *impl = user_data;
pw_log_trace_fp("%p", impl);
if (impl->drained && impl->io != NULL)
impl->io->status = SPA_STATUS_NEED_DATA;
impl->draining = impl->drained = false;
return 0;
}
SPA_EXPORT SPA_EXPORT
int pw_stream_set_active(struct pw_stream *stream, bool active) int pw_stream_set_active(struct pw_stream *stream, bool active)
{ {
@ -2383,12 +2395,8 @@ int pw_stream_set_active(struct pw_stream *stream, bool active)
return -EIO; return -EIO;
pw_impl_node_set_active(stream->node, active); pw_impl_node_set_active(stream->node, active);
pw_loop_locked(impl->data_loop, do_stop_drain, 1, NULL, 0, impl);
if (!active || impl->drained) {
if (impl->drained && impl->io != NULL)
impl->io->status = SPA_STATUS_NEED_DATA;
impl->drained = impl->draining = false;
}
return 0; return 0;
} }