asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-22 21:56:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

axfer: code refactoring for a helper function to wait for avail buffer space

Browse source 
This commit applies code refactoring for waiting PCM event queued
per period of PCM buffer in copying operation for IRQ-based scheduling
model.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Takashi Sakamoto 2019-10-30 09:35:55 +09:00 committed by Jaroslav Kysela
parent a07eb8e235
commit 498ca99461
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
axfer/xfer-libasound-irq-rw.c
View file

@ -19,6 +19,32 @@ struct rw_closure {
struct frame_cache cache;
};
static int wait_for_avail(struct libasound_state *state)
{
unsigned short revents;
unsigned short event;
int err;
// Wait for hardware IRQ when no available space.
err = xfer_libasound_wait_event(state, -1, &revents);
if (err < 0)
return err;
// TODO: error reporting.
if (revents & POLLERR)
return -EIO;
if (snd_pcm_stream(state->handle) == SND_PCM_STREAM_CAPTURE)
event = POLLIN;
else
event = POLLOUT;
if (!(revents & event))
return -EAGAIN;
return 0;
}
static int read_frames(struct libasound_state *state, unsigned int *frame_count,
unsigned int avail_count, struct mapper_context *mapper,
struct container_context *cntrs)
@ -134,21 +160,9 @@ static int r_process_frames_nonblocking(struct libasound_state *state,
}
if (state->use_waiter) {
unsigned short revents;
// Wait for hardware IRQ when no available space.
err = xfer_libasound_wait_event(state, -1, &revents);
err = wait_for_avail(state);
if (err < 0)
goto error;
if (revents & POLLERR) {
// TODO: error reporting.
err = -EIO;
goto error;
}
if (!(revents & POLLIN)) {
err = -EAGAIN;
goto error;
}
}
// Check available space on the buffer.
@ -300,21 +314,9 @@ static int w_process_frames_nonblocking(struct libasound_state *state,
int err;
if (state->use_waiter) {
unsigned short revents;
// Wait for hardware IRQ when no left space.
err = xfer_libasound_wait_event(state, -1, &revents);
err = wait_for_avail(state);
if (err < 0)
goto error;
if (revents & POLLERR) {
// TODO: error reporting.
err = -EIO;
goto error;
}
if (!(revents & POLLOUT)) {
err = -EAGAIN;
goto error;
}
}
// Check available space on the buffer.