Skip to content

Improve compatibilty with BlueALSA #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Improve compatibilty with BlueALSA #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c64861
Implement recovery from disconnected PCM
borine Mar 23, 2022
584a2ae
Improve accuracy of latency reporting
borine Mar 23, 2022
8d018ef
fix use-after-free in apulse-stream.c
borine Mar 28, 2022
8ffbe6c
Timeout pcm connection when corked
borine Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 32 additions & 9 deletions src/apulse-mainloop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ml_api_io_new(pa_mainloop_api *a, int fd, pa_io_event_flags_t events,
ioe->cb_userdata = userdata;
ioe->mainloop = ml;
ioe->pollfd = NULL;
ioe->pcm = NULL;
ioe->s = NULL;

g_hash_table_replace(ml->events_ht, ioe, ioe);
ml->recreate_fds = 1;
Expand Down Expand Up @@ -270,21 +270,26 @@ pa_mainloop_api_once(pa_mainloop_api *m,
pa_operation_launch(op);
}

static void
static int
recover_pcm(snd_pcm_t *pcm)
{
int ret = 0;
switch (snd_pcm_state(pcm)) {
case SND_PCM_STATE_XRUN:
snd_pcm_recover(pcm, -EPIPE, 1);
ret = snd_pcm_recover(pcm, -EPIPE, 1);
break;
case SND_PCM_STATE_SUSPENDED:
snd_pcm_recover(pcm, -ESTRPIPE, 1);
ret = snd_pcm_recover(pcm, -ESTRPIPE, 1);
break;
case SND_PCM_STATE_DISCONNECTED:
ret = -1;
break;
default:
snd_pcm_drop(pcm);
snd_pcm_prepare(pcm);
ret = snd_pcm_prepare(pcm);
break;
}
return ret;
}

static long
Expand All @@ -294,6 +299,17 @@ microseconds_till_event(pa_usec_t now, const struct timeval *event_when)
now;
}

static void
deferred_stream_restart(pa_mainloop_api *a, pa_defer_event* e, void *userdata)
{
(void) a;
(void) e;
struct pa_io_event *ioe = userdata;

if (apulse_stream_restart(ioe->s) < 0)
trace_error("Unrecoverable ALSA PCM error\n");
}

APULSE_EXPORT
int
pa_mainloop_dispatch(pa_mainloop *m)
Expand All @@ -312,14 +328,15 @@ pa_mainloop_dispatch(pa_mainloop *m)
unsigned short revents = 0;

if (0 < idx && idx <= m->alsa_special_cnt) {
snd_pcm_poll_descriptors_revents(ioe->pcm, ioe->pollfd, 1,
snd_pcm_poll_descriptors_revents(ioe->s->ph, ioe->pollfd, 1,
&revents);
} else {
revents = ioe->pollfd->revents;
}

if (revents & (~(POLLOUT | POLLIN))) {
recover_pcm(ioe->pcm);
if (recover_pcm(ioe->s->ph) < 0)
ml_api_defer_new(&m->api, deferred_stream_restart, ioe);
} else {
pa_io_event_flags_t eflags = to_pa_io_event_flags(revents);
if (ioe->cb)
Expand Down Expand Up @@ -429,6 +446,8 @@ pa_mainloop_new(void)
trace_info_f("F %s (void)\n", __func__);

pa_mainloop *m = calloc(1, sizeof(pa_mainloop));
if (m == NULL)
return NULL;

m->api.userdata = m;
m->api.io_new = ml_api_io_new;
Expand All @@ -450,7 +469,10 @@ pa_mainloop_new(void)
m->events_ht = g_hash_table_new(g_direct_hash, g_direct_equal);
m->recreate_fds = 1;

pipe(m->wakeup_pipe);
if (pipe(m->wakeup_pipe) == -1) {
free(m);
return NULL;
}
make_nonblock(m->wakeup_pipe[0]);
make_nonblock(m->wakeup_pipe[1]);

Expand Down Expand Up @@ -607,5 +629,6 @@ pa_mainloop_wakeup(pa_mainloop *m)
trace_info_f("F %s m=%p\n", __func__, m);

char c = '!';
write(m->wakeup_pipe[1], &c, 1);
if (write(m->wakeup_pipe[1], &c, 1) != 1)
trace_error("Unable to write to wakeup pipe: %s\n", strerror(errno));
}
Loading