mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't handle underrun special

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1489 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-06-23 20:03:30 +00:00
parent f0616367b3
commit 780f736547
1 changed files with 29 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/modules/module-pipe-sink.c
View file

@ -115,15 +115,12 @@ static void thread_func(void *userdata) {
struct userdata *u = userdata; struct userdata *u = userdata;
struct pollfd pollfd[POLLFD_MAX]; struct pollfd pollfd[POLLFD_MAX];
int underrun = 0;
int write_type = 0; int write_type = 0;
pa_assert(u); pa_assert(u);
pa_log_debug("Thread starting up"); pa_log_debug("Thread starting up");
pa_memchunk_reset(&u->memchunk);
memset(&pollfd, 0, sizeof(pollfd)); memset(&pollfd, 0, sizeof(pollfd));
pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->asyncmsgq); pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->asyncmsgq);
@ -153,56 +150,53 @@ static void thread_func(void *userdata) {
/* Render some data and write it to the fifo */ /* Render some data and write it to the fifo */
if (u->sink->thread_info.state == PA_SINK_RUNNING && (pollfd[POLLFD_FIFO].revents || underrun)) { if (u->sink->thread_info.state == PA_SINK_RUNNING && pollfd[POLLFD_FIFO].revents) {
ssize_t l;
void *p;
if (u->memchunk.length <= 0) if (u->memchunk.length <= 0)
pa_sink_render(u->sink, PIPE_BUF, &u->memchunk); pa_sink_render(u->sink, PIPE_BUF, &u->memchunk);
underrun = u->memchunk.length <= 0; pa_assert(u->memchunk.length > 0);
if (!underrun) { p = pa_memblock_acquire(u->memchunk.memblock);
ssize_t l; l = pa_write(u->fd, (uint8_t*) p + u->memchunk.index, u->memchunk.length, &write_type);
void *p; pa_memblock_release(u->memchunk.memblock);
p = pa_memblock_acquire(u->memchunk.memblock); pa_assert(l != 0);
l = pa_write(u->fd, (uint8_t*) p + u->memchunk.index, u->memchunk.length, &write_type);
pa_memblock_release(u->memchunk.memblock);
pa_assert(l != 0); if (l < 0) {
if (l < 0) {
if (errno == EINTR) if (errno == EINTR)
continue;
else if (errno != EAGAIN) {
pa_log("Failed to write data to FIFO: %s", pa_cstrerror(errno));
goto fail;
}
} else {
u->memchunk.index += l;
u->memchunk.length -= l;
if (u->memchunk.length <= 0) {
pa_memblock_unref(u->memchunk.memblock);
pa_memchunk_reset(&u->memchunk);
}
pollfd[POLLFD_FIFO].revents = 0;
continue; continue;
else if (errno != EAGAIN) {
pa_log("Failed to write data to FIFO: %s", pa_cstrerror(errno));
goto fail;
} }
} else {
u->memchunk.index += l;
u->memchunk.length -= l;
if (u->memchunk.length <= 0) {
pa_memblock_unref(u->memchunk.memblock);
pa_memchunk_reset(&u->memchunk);
}
pollfd[POLLFD_FIFO].revents = 0;
continue;
} }
} }
pollfd[POLLFD_FIFO].events = (u->sink->thread_info.state == PA_SINK_RUNNING && !underrun) ? POLLOUT : 0; pollfd[POLLFD_FIFO].events = u->sink->thread_info.state == PA_SINK_RUNNING ? POLLOUT : 0;
/* Hmm, nothing to do. Let's sleep */ /* Hmm, nothing to do. Let's sleep */
if (pa_asyncmsgq_before_poll(u->asyncmsgq) < 0) if (pa_asyncmsgq_before_poll(u->asyncmsgq) < 0)
continue; continue;
/* pa_log("polling for %u (underrun=%i)", pollfd[POLLFD_FIFO].events, underrun); */ /* pa_log("polling for %u", pollfd[POLLFD_FIFO].events); */
r = poll(pollfd, POLLFD_MAX, -1); r = poll(pollfd, POLLFD_MAX, -1);
/* pa_log("polling got %u", r > 0 ? pollfd[POLLFD_FIFO].revents : 0); */ /* pa_log("polling got %u", r > 0 ? pollfd[POLLFD_FIFO].revents : 0); */
@ -260,6 +254,7 @@ int pa__init(pa_core *c, pa_module*m) {
u->core = c; u->core = c;
u->module = m; u->module = m;
m->userdata = u; m->userdata = u;
pa_memchunk_reset(&u->memchunk);
pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0)); pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0));