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

alsa: implement drain function

Browse source 
Implement a drain function that blocks and waits for the drain to
complete.
This commit is contained in:
Wim Taymans 2020-04-07 17:48:28 +02:00
parent 70f5abfe35
commit 029f431418
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
pipewire-alsa/alsa-plugins/pcm_pipewire.c
View file

@ -160,15 +160,9 @@ static int snd_pcm_pipewire_poll_revents(snd_pcm_ioplug_t *io,
static snd_pcm_sframes_t snd_pcm_pipewire_pointer(snd_pcm_ioplug_t *io) static snd_pcm_sframes_t snd_pcm_pipewire_pointer(snd_pcm_ioplug_t *io)
{ {
snd_pcm_pipewire_t *pw = io->private_data; snd_pcm_pipewire_t *pw = io->private_data;
snd_pcm_sframes_t hw_ptr = pw->hw_ptr;
if (pw->error < 0) if (pw->error < 0)
return pw->error; return pw->error;
return pw->hw_ptr;
if (pw->draining && !pw->drained)
hw_ptr = hw_ptr > 1 ? hw_ptr - 1 : (snd_pcm_sframes_t)(pw->boundary - 1);
return hw_ptr;
} }
static int static int
@ -393,6 +387,7 @@ static void on_stream_drained(void *data)
{ {
snd_pcm_pipewire_t *pw = data; snd_pcm_pipewire_t *pw = data;
pw->drained = true; pw->drained = true;
pw->draining = false;
pw_log_debug(NAME" %p: drained", pw); pw_log_debug(NAME" %p: drained", pw);
pw_thread_loop_signal(pw->main_loop, false); pw_thread_loop_signal(pw->main_loop, false);
} }
@ -404,6 +399,22 @@ static const struct pw_stream_events stream_events = {
.drained = on_stream_drained, .drained = on_stream_drained,
}; };
static int snd_pcm_pipewire_drain(snd_pcm_ioplug_t *io)
{
int res;
snd_pcm_pipewire_t *pw = io->private_data;
pw_thread_loop_lock(pw->main_loop);
pw->drained = false;
pw->draining = false;
while (!pw->drained && pw->error >= 0 && pw->activated) {
pw_thread_loop_wait(pw->main_loop);
}
res = pw->error;
pw_thread_loop_unlock(pw->main_loop);
return res;
}
static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io)
{ {
snd_pcm_pipewire_t *pw = io->private_data; snd_pcm_pipewire_t *pw = io->private_data;
@ -741,6 +752,7 @@ static snd_pcm_ioplug_callback_t pipewire_pcm_callback = {
.start = snd_pcm_pipewire_start, .start = snd_pcm_pipewire_start,
.stop = snd_pcm_pipewire_stop, .stop = snd_pcm_pipewire_stop,
.pointer = snd_pcm_pipewire_pointer, .pointer = snd_pcm_pipewire_pointer,
.drain = snd_pcm_pipewire_drain,
.prepare = snd_pcm_pipewire_prepare, .prepare = snd_pcm_pipewire_prepare,
.poll_revents = snd_pcm_pipewire_poll_revents, .poll_revents = snd_pcm_pipewire_poll_revents,
.hw_params = snd_pcm_pipewire_hw_params, .hw_params = snd_pcm_pipewire_hw_params,