* [PATCH 2/2] plugio: Check for pointer callback error codes
@ 2021-08-23 11:48 Arkadiusz Bokowy
2021-08-23 15:12 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Arkadiusz Bokowy @ 2021-08-23 11:48 UTC (permalink / raw)
To: alsa-devel
By checking error code returned by the pointer callback, we can
determine more precisely PCM state. Previous implementation assumed,
that a software PCM can only produce overrun or underrun. It was
impossible to mark software PCM as disconnected.
Signed-off-by: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
---
src/pcm/pcm_ioplug.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c
index c96104e9..0e27e121 100644
--- a/src/pcm/pcm_ioplug.c
+++ b/src/pcm/pcm_ioplug.c
@@ -81,11 +81,21 @@ static int snd_pcm_ioplug_hw_ptr_update(snd_pcm_t *pcm)
}
io->last_hw = (snd_pcm_uframes_t)hw;
} else {
+ switch (hw) {
+ case -ESTRPIPE:
+ io->data->state = SND_PCM_STATE_SUSPENDED;
+ break;
+ case -ENODEV:
+ io->data->state = SND_PCM_STATE_DISCONNECTED;
+ break;
+ default:
+ io->data->state = SND_PCM_STATE_XRUN;
+ }
if (io->data->state == SND_PCM_STATE_DRAINING)
snd_pcm_ioplug_drop(pcm);
else
io->data->state = SNDRV_PCM_STATE_XRUN;
- return -EPIPE;
+ return hw;
}
return 0;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2/2] plugio: Check for pointer callback error codes
2021-08-23 11:48 [PATCH 2/2] plugio: Check for pointer callback error codes Arkadiusz Bokowy
@ 2021-08-23 15:12 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2021-08-23 15:12 UTC (permalink / raw)
To: Arkadiusz Bokowy; +Cc: alsa-devel
On Mon, 23 Aug 2021 13:48:38 +0200,
Arkadiusz Bokowy wrote:
>
> By checking error code returned by the pointer callback, we can
> determine more precisely PCM state. Previous implementation assumed,
> that a software PCM can only produce overrun or underrun. It was
> impossible to mark software PCM as disconnected.
>
> Signed-off-by: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
Please fix MUA setup.
Also...
> ---
> src/pcm/pcm_ioplug.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c
> index c96104e9..0e27e121 100644
> --- a/src/pcm/pcm_ioplug.c
> +++ b/src/pcm/pcm_ioplug.c
> @@ -81,11 +81,21 @@ static int snd_pcm_ioplug_hw_ptr_update(snd_pcm_t *pcm)
> }
> io->last_hw = (snd_pcm_uframes_t)hw;
> } else {
> + switch (hw) {
> + case -ESTRPIPE:
> + io->data->state = SND_PCM_STATE_SUSPENDED;
> + break;
> + case -ENODEV:
> + io->data->state = SND_PCM_STATE_DISCONNECTED;
> + break;
> + default:
> + io->data->state = SND_PCM_STATE_XRUN;
> + }
> if (io->data->state == SND_PCM_STATE_DRAINING)
> snd_pcm_ioplug_drop(pcm);
> else
> io->data->state = SNDRV_PCM_STATE_XRUN;
> - return -EPIPE;
> + return hw;
Be careful about the handling of the draining case.
thanks,
Takashi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-23 15:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-23 11:48 [PATCH 2/2] plugio: Check for pointer callback error codes Arkadiusz Bokowy
2021-08-23 15:12 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.