diff options
Diffstat (limited to 'pulse/pcm_pulse.c')
| -rw-r--r-- | pulse/pcm_pulse.c | 998 |
1 files changed, 525 insertions, 473 deletions
diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c index 7edd157..8743a02 100644 --- a/pulse/pcm_pulse.c +++ b/pulse/pcm_pulse.c @@ -29,366 +29,377 @@ typedef struct snd_pcm_pulse { snd_pcm_ioplug_t io; - snd_pulse_t *p; + snd_pulse_t *p; - char *device; + char *device; - /* Since ALSA expects a ring buffer we must do some voodoo. */ - size_t last_size; - size_t ptr; - int underrun; + /* Since ALSA expects a ring buffer we must do some voodoo. */ + size_t last_size; + size_t ptr; + int underrun; - size_t offset; + size_t offset; - pa_stream *stream; + pa_stream *stream; - pa_sample_spec ss; - unsigned int frame_size; - pa_buffer_attr buffer_attr; + pa_sample_spec ss; + unsigned int frame_size; + pa_buffer_attr buffer_attr; } snd_pcm_pulse_t; -static void update_ptr(snd_pcm_pulse_t *pcm) +static void update_ptr(snd_pcm_pulse_t * pcm) { - size_t size; + size_t size; - if (pcm->io.stream == SND_PCM_STREAM_PLAYBACK) - size = pa_stream_writable_size(pcm->stream); - else - size = pa_stream_readable_size(pcm->stream) - pcm->offset; + if (pcm->io.stream == SND_PCM_STREAM_PLAYBACK) + size = pa_stream_writable_size(pcm->stream); + else + size = pa_stream_readable_size(pcm->stream) - pcm->offset; - if (size > pcm->last_size) { - pcm->ptr += size - pcm->last_size; - pcm->ptr %= pcm->buffer_attr.tlength; - } + if (size > pcm->last_size) { + pcm->ptr += size - pcm->last_size; + pcm->ptr %= pcm->buffer_attr.tlength; + } - pcm->last_size = size; + pcm->last_size = size; } -static int pulse_start(snd_pcm_ioplug_t *io) +static int pulse_start(snd_pcm_ioplug_t * io) { snd_pcm_pulse_t *pcm = io->private_data; pa_operation *o, *u; int err = 0, err_o = 0, err_u = 0; - assert(pcm); - assert(pcm->p); + assert(pcm); + assert(pcm->p); - if (pcm->stream == NULL) - return 0; + if (pcm->stream == NULL) + return 0; - pa_threaded_mainloop_lock(pcm->p->mainloop); + pa_threaded_mainloop_lock(pcm->p->mainloop); - err = pulse_check_connection(pcm->p); - if (err < 0) - goto finish; + err = pulse_check_connection(pcm->p); + if (err < 0) + goto finish; - o = pa_stream_cork(pcm->stream, 0, pulse_stream_success_cb, pcm->p); - if (!o) { - err = -EIO; - goto finish; - } + o = pa_stream_cork(pcm->stream, 0, pulse_stream_success_cb, + pcm->p); + if (!o) { + err = -EIO; + goto finish; + } - u = pa_stream_trigger(pcm->stream, pulse_stream_success_cb, pcm->p); - if (!u) { - pa_operation_unref(o); - err = -EIO; - goto finish; - } + u = pa_stream_trigger(pcm->stream, pulse_stream_success_cb, + pcm->p); + if (!u) { + pa_operation_unref(o); + err = -EIO; + goto finish; + } - err_o = pulse_wait_operation(pcm->p, o); - err_u = pulse_wait_operation(pcm->p, u); + err_o = pulse_wait_operation(pcm->p, o); + err_u = pulse_wait_operation(pcm->p, u); - pa_operation_unref(o); - pa_operation_unref(u); + pa_operation_unref(o); + pa_operation_unref(u); - if (err_o < 0 || err_u < 0) { - err = -EIO; - goto finish; - } else - pcm->underrun = 0; + if (err_o < 0 || err_u < 0) { + err = -EIO; + goto finish; + } else + pcm->underrun = 0; -finish: - pa_threaded_mainloop_unlock(pcm->p->mainloop); + finish: + pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; } -static int pulse_stop(snd_pcm_ioplug_t *io) +static int pulse_stop(snd_pcm_ioplug_t * io) { snd_pcm_pulse_t *pcm = io->private_data; pa_operation *o; int err = 0; - assert(pcm); - assert(pcm->p); + assert(pcm); + assert(pcm->p); - pa_threaded_mainloop_lock(pcm->p->mainloop); + pa_threaded_mainloop_lock(pcm->p->mainloop); - err = pulse_check_connection(pcm->p); - if (err < 0) - goto finish; + err = pulse_check_connection(pcm->p); + if (err < 0) + goto finish; - /* If stream connection fails, this gets called anyway */ - if (pcm->stream == NULL) - goto finish; + /* If stream connection fails, this gets called anyway */ + if (pcm->stream == NULL) + goto finish; - o = pa_stream_flush(pcm->stream, pulse_stream_success_cb, pcm->p); - if (!o) { - err = -EIO; - goto finish; - } + o = pa_stream_flush(pcm->stream, pulse_stream_success_cb, pcm->p); + if (!o) { + err = -EIO; + goto finish; + } - err = pulse_wait_operation(pcm->p, o); + err = pulse_wait_operation(pcm->p, o); - pa_operation_unref(o); + pa_operation_unref(o); - if (err < 0) { - err = -EIO; - goto finish; - } + if (err < 0) { + err = -EIO; + goto finish; + } - o = pa_stream_cork(pcm->stream, 1, pulse_stream_success_cb, pcm->p); - if (!o) { - err = -EIO; - goto finish; - } + o = pa_stream_cork(pcm->stream, 1, pulse_stream_success_cb, + pcm->p); + if (!o) { + err = -EIO; + goto finish; + } - err = pulse_wait_operation(pcm->p, o); + err = pulse_wait_operation(pcm->p, o); - pa_operation_unref(o); + pa_operation_unref(o); - if (err < 0) { - err = -EIO; - goto finish; - } + if (err < 0) { + err = -EIO; + goto finish; + } -finish: - pa_threaded_mainloop_unlock(pcm->p->mainloop); + finish: + pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; } -int pulse_drain(snd_pcm_ioplug_t *io) +int pulse_drain(snd_pcm_ioplug_t * io) { - snd_pcm_pulse_t *pcm = io->private_data; + snd_pcm_pulse_t *pcm = io->private_data; pa_operation *o; int err = 0; - assert(pcm); - assert(pcm->p); + assert(pcm); + assert(pcm->p); - pa_threaded_mainloop_lock(pcm->p->mainloop); + pa_threaded_mainloop_lock(pcm->p->mainloop); - assert(pcm->stream); + assert(pcm->stream); - err = pulse_check_connection(pcm->p); - if (err < 0) - goto finish; + err = pulse_check_connection(pcm->p); + if (err < 0) + goto finish; - o = pa_stream_drain(pcm->stream, pulse_stream_success_cb, pcm->p); - if (!o) { - err = -EIO; - goto finish; - } + o = pa_stream_drain(pcm->stream, pulse_stream_success_cb, pcm->p); + if (!o) { + err = -EIO; + goto finish; + } - err = pulse_wait_operation(pcm->p, o); + err = pulse_wait_operation(pcm->p, o); - pa_operation_unref(o); + pa_operation_unref(o); - if (err < 0) { - err = -EIO; - goto finish; - } + if (err < 0) { + err = -EIO; + goto finish; + } -finish: - pa_threaded_mainloop_unlock(pcm->p->mainloop); + finish: + pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; } -static snd_pcm_sframes_t pulse_pointer(snd_pcm_ioplug_t *io) +static snd_pcm_sframes_t pulse_pointer(snd_pcm_ioplug_t * io) { snd_pcm_pulse_t *pcm = io->private_data; int err = 0; - assert(pcm); - assert(pcm->p); + assert(pcm); + assert(pcm->p); - pa_threaded_mainloop_lock(pcm->p->mainloop); + pa_threaded_mainloop_lock(pcm->p->mainloop); - assert(pcm->stream); + assert(pcm->stream); - err = pulse_check_connection(pcm->p); - if (err < 0) - goto finish; + err = pulse_check_connection(pcm->p); + if (err < 0) + goto finish; - update_ptr(pcm); + update_ptr(pcm); err = snd_pcm_bytes_to_frames(io->pcm, pcm->ptr); if (pcm->underrun) err = -EPIPE; -finish: - pa_threaded_mainloop_unlock(pcm->p->mainloop); + finish: + pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; } -static int pulse_delay(snd_pcm_ioplug_t *io, - snd_pcm_sframes_t *delayp) +static int pulse_delay(snd_pcm_ioplug_t * io, snd_pcm_sframes_t * delayp) { snd_pcm_pulse_t *pcm = io->private_data; int err = 0; pa_usec_t lat; - assert(pcm); - assert(pcm->p); + assert(pcm); + assert(pcm->p); - pa_threaded_mainloop_lock(pcm->p->mainloop); + pa_threaded_mainloop_lock(pcm->p->mainloop); - assert(pcm->stream); + assert(pcm->stream); - err = pulse_check_connection(pcm->p); - if (err < 0) - goto finish; + err = pulse_check_connection(pcm->p); + if (err < 0) + goto finish; if (pa_stream_get_latency(pcm->stream, &lat, NULL)) { err = -EIO; goto finish; } - *delayp = snd_pcm_bytes_to_frames(io->pcm, pa_usec_to_bytes(lat, &pcm->ss)); + *delayp = + snd_pcm_bytes_to_frames(io->pcm, + pa_usec_to_bytes(lat, &pcm->ss)); - if (pcm->underrun && pcm->io.state == SND_PCM_STATE_RUNNING) + if (pcm->underrun && pcm->io.state == SND_PCM_STATE_RUNNING) snd_pcm_ioplug_set_state(io, SND_PCM_STATE_XRUN); -finish: - pa_threaded_mainloop_unlock(pcm->p->mainloop); + finish: + pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; } -static snd_pcm_sframes_t pulse_write(snd_pcm_ioplug_t *io, - const snd_pcm_channel_area_t *areas, - snd_pcm_uframes_t offset, - snd_pcm_uframes_t size) +static snd_pcm_sframes_t pulse_write(snd_pcm_ioplug_t * io, + const snd_pcm_channel_area_t * areas, + snd_pcm_uframes_t offset, + snd_pcm_uframes_t size) { snd_pcm_pulse_t *pcm = io->private_data; const char *buf; int err = 0; - assert(pcm); - assert(pcm->p); + assert(pcm); + assert(pcm->p); - pa_threaded_mainloop_lock(pcm->p->mainloop); + pa_threaded_mainloop_lock(pcm->p->mainloop); - assert(pcm->stream); + assert(pcm->stream); - err = pulse_check_connection(pcm->p); - if (err < 0) - goto finish; + err = pulse_check_connection(pcm->p); + if (err < 0) + goto finish; - /* Make sure the buffer pointer is in sync */ - update_ptr(pcm); + /* Make sure the buffer pointer is in sync */ + update_ptr(pcm); - assert(pcm->last_size >= (size * pcm->frame_size)); + assert(pcm->last_size >= (size * pcm->frame_size)); - buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8; + buf = + (char *) areas->addr + (areas->first + + areas->step * offset) / 8; - pa_stream_write(pcm->stream, buf, size * pcm->frame_size, NULL, 0, 0); + pa_stream_write(pcm->stream, buf, size * pcm->frame_size, NULL, 0, + 0); - /* Make sure the buffer pointer is in sync */ - update_ptr(pcm); + /* Make sure the buffer pointer is in sync */ + update_ptr(pcm); - if (pcm->last_size < pcm->buffer_attr.minreq) - pulse_poll_deactivate(pcm->p); + if (pcm->last_size < pcm->buffer_attr.minreq) + pulse_poll_deactivate(pcm->p); - err = size; - pcm->underrun = 0; + err = size; + pcm->underrun = 0; -finish: - pa_threaded_mainloop_unlock(pcm->p->mainloop); + finish: + pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; } -static snd_pcm_sframes_t pulse_read(snd_pcm_ioplug_t *io, - const snd_pcm_channel_area_t *areas, - snd_pcm_uframes_t offset, - snd_pcm_uframes_t size) +static snd_pcm_sframes_t pulse_read(snd_pcm_ioplug_t * io, + const snd_pcm_channel_area_t * areas, + snd_pcm_uframes_t offset, + snd_pcm_uframes_t size) { snd_pcm_pulse_t *pcm = io->private_data; void *dst_buf, *src_buf; size_t remain_size, frag_length; int err = 0; - assert(pcm); - assert(pcm->p); + assert(pcm); + assert(pcm->p); - pa_threaded_mainloop_lock(pcm->p->mainloop); + pa_threaded_mainloop_lock(pcm->p->mainloop); - assert(pcm->stream); + assert(pcm->stream); - err = pulse_check_connection(pcm->p); - if (err < 0) - goto finish; + err = pulse_check_connection(pcm->p); + if (err < 0) + goto finish; - /* Make sure the buffer pointer is in sync */ - update_ptr(pcm); + /* Make sure the buffer pointer is in sync */ + update_ptr(pcm); - remain_size = size * pcm->frame_size; + remain_size = size * pcm->frame_size; - dst_buf = (char *)areas->addr + (areas->first + areas->step * offset) / 8; - while (remain_size > 0) { - pa_stream_peek(pcm->stream, (const void**)&src_buf, &frag_length); - if (frag_length == 0) - break; + dst_buf = + (char *) areas->addr + (areas->first + + areas->step * offset) / 8; + while (remain_size > 0) { + pa_stream_peek(pcm->stream, (const void **) &src_buf, + &frag_length); + if (frag_length == 0) + break; - src_buf = (char*)src_buf + pcm->offset; - frag_length -= pcm->offset; + src_buf = (char *) src_buf + pcm->offset; + frag_length -= pcm->offset; - if (frag_length > remain_size) { - pcm->offset += remain_size; - frag_length = remain_size; - } else - pcm->offset = 0; + if (frag_length > remain_size) { + pcm->offset += remain_size; + frag_length = remain_size; + } else + pcm->offset = 0; - memcpy(dst_buf, src_buf, frag_length); + memcpy(dst_buf, src_buf, frag_length); - if (pcm->offset == 0) - pa_stream_drop(pcm->stream); + if (pcm->offset == 0) + pa_stream_drop(pcm->stream); - dst_buf = (char*)dst_buf + frag_length; - remain_size -= frag_length; - } + dst_buf = (char *) dst_buf + frag_length; + remain_size -= frag_length; + } - /* Make sure the buffer pointer is in sync */ - update_ptr(pcm); + /* Make sure the buffer pointer is in sync */ + update_ptr(pcm); - if (pcm->last_size < pcm->buffer_attr.minreq) - pulse_poll_deactivate(pcm->p); + if (pcm->last_size < pcm->buffer_attr.minreq) + pulse_poll_deactivate(pcm->p); - err = size - (remain_size / pcm->frame_size); + err = size - (remain_size / pcm->frame_size); -finish: - pa_threaded_mainloop_unlock(pcm->p->mainloop); + finish: + pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; } -static void stream_request_cb(pa_stream *p, size_t length, void *userdata) +static void stream_request_cb(pa_stream * p, size_t length, void *userdata) { - snd_pcm_pulse_t *pcm = userdata; + snd_pcm_pulse_t *pcm = userdata; - assert(pcm); - assert(pcm->p); + assert(pcm); + assert(pcm->p); - pulse_poll_activate(pcm->p); + pulse_poll_activate(pcm->p); } -static void stream_underrun_cb(pa_stream *p, void *userdata) { +static void stream_underrun_cb(pa_stream * p, void *userdata) +{ snd_pcm_pulse_t *pcm = userdata; assert(pcm); @@ -397,231 +408,262 @@ static void stream_underrun_cb(pa_stream *p, void *userdata) { pcm->underrun = 1; } -static int pulse_pcm_poll_descriptors_count(snd_pcm_ioplug_t *io) +static int pulse_pcm_poll_descriptors_count(snd_pcm_ioplug_t * io) { snd_pcm_pulse_t *pcm = io->private_data; int count; - assert(pcm); - assert(pcm->p); + assert(pcm); + assert(pcm->p); - pa_threaded_mainloop_lock(pcm->p->mainloop); + pa_threaded_mainloop_lock(pcm->p->mainloop); - count = pulse_poll_descriptors_count(pcm->p); + count = pulse_poll_descriptors_count(pcm->p); - pa_threaded_mainloop_unlock(pcm->p->mainloop); + pa_threaded_mainloop_unlock(pcm->p->mainloop); return count; } -static int pulse_pcm_poll_descriptors(snd_pcm_ioplug_t *io, struct pollfd *pfd, unsigned int space) +static int pulse_pcm_poll_descriptors(snd_pcm_ioplug_t * io, + struct pollfd *pfd, + unsigned int space) { snd_pcm_pulse_t *pcm = io->private_data; int err; - assert(pcm); - assert(pcm->p); + assert(pcm); + assert(pcm->p); - pa_threaded_mainloop_lock(pcm->p->mainloop); + pa_threaded_mainloop_lock(pcm->p->mainloop); - err = pulse_poll_descriptors(pcm->p, pfd, space); + err = pulse_poll_descriptors(pcm->p, pfd, space); - pa_threaded_mainloop_unlock(pcm->p->mainloop); + pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; } -static int pulse_pcm_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfd, unsigned int nfds, unsigned short *revents) +static int pulse_pcm_poll_revents(snd_pcm_ioplug_t * io, + struct pollfd *pfd, unsigned int nfds, + unsigned short *revents) { snd_pcm_pulse_t *pcm = io->private_data; int err = 0; - assert(pcm); - assert(pcm->p); - - pa_threaded_mainloop_lock(pcm->p->mainloop); - - err = pulse_poll_revents(pcm->p, pfd, nfds, revents); - if (err < 0) - goto finish; + assert(pcm); + assert(pcm->p); - *revents = 0; + pa_threaded_mainloop_lock(pcm->p->mainloop); - /* - * Make sure we have an up-to-date value. - */ - update_ptr(pcm); + err = pulse_poll_revents(pcm->p, pfd, nfds, revents); + if (err < 0) + goto finish; - /* - * ALSA thinks in periods, not bytes, samples or frames. - */ - if (pcm->last_size >= pcm->buffer_attr.minreq) { - if (io->stream == SND_PCM_STREAM_PLAYBACK) - *revents |= POLLOUT; - else - *revents |= POLLIN; - } + *revents = 0; + + /* + * Make sure we have an up-to-date value. + */ + update_ptr(pcm); + + /* + * ALSA thinks in periods, not bytes, samples or frames. + */ + if (pcm->last_size >= pcm->buffer_attr.minreq) { + if (io->stream == SND_PCM_STREAM_PLAYBACK) + *revents |= POLLOUT; + else + *revents |= POLLIN; + } -finish: - pa_threaded_mainloop_unlock(pcm->p->mainloop); + finish: + pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; } -static int pulse_prepare(snd_pcm_ioplug_t *io) +static int pulse_prepare(snd_pcm_ioplug_t * io) { - pa_channel_map map; - snd_pcm_pulse_t *pcm = io->private_data; - int err = 0; - - assert(pcm); - assert(pcm->p); - - pa_threaded_mainloop_lock(pcm->p->mainloop); - - if (pcm->stream) { - pa_stream_disconnect(pcm->stream); - pulse_wait_stream_state(pcm->p, pcm->stream, PA_STREAM_TERMINATED); - pa_stream_unref(pcm->stream); - pcm->stream = NULL; - } - - err = pulse_check_connection(pcm->p); - if (err < 0) - goto finish; - - assert(pcm->stream == NULL); - - if (io->stream == SND_PCM_STREAM_PLAYBACK) - pcm->stream = pa_stream_new(pcm->p->context, "ALSA Playback", &pcm->ss, - pa_channel_map_init_auto(&map, pcm->ss.channels, PA_CHANNEL_MAP_ALSA)); - else - pcm->stream = pa_stream_new(pcm->p->context, "ALSA Capture", &pcm->ss, - pa_channel_map_init_auto(&map, pcm->ss.channels, PA_CHANNEL_MAP_ALSA)); - assert(pcm->stream); - - pa_stream_set_state_callback(pcm->stream, pulse_stream_state_cb, pcm->p); - - if (io->stream == SND_PCM_STREAM_PLAYBACK) { - pa_stream_set_write_callback(pcm->stream, stream_request_cb, pcm); - pa_stream_set_underflow_callback(pcm->stream, stream_underrun_cb, pcm); - pa_stream_connect_playback(pcm->stream, pcm->device, &pcm->buffer_attr, - PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_INTERPOLATE_TIMING, NULL, NULL); - } else { - pa_stream_set_read_callback(pcm->stream, stream_request_cb, pcm); - pa_stream_connect_record(pcm->stream, pcm->device, &pcm->buffer_attr, - PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_INTERPOLATE_TIMING); - } - - err = pulse_wait_stream_state(pcm->p, pcm->stream, PA_STREAM_READY); - if (err < 0) { - fprintf(stderr, "*** PULSEAUDIO: Unable to create stream.\n"); - pa_stream_unref(pcm->stream); - pcm->stream = NULL; - goto finish; - } - - pcm->last_size = 0; - pcm->ptr = 0; - pcm->offset = 0; - pcm->underrun = 0; - -finish: - pa_threaded_mainloop_unlock(pcm->p->mainloop); + pa_channel_map map; + snd_pcm_pulse_t *pcm = io->private_data; + int err = 0; + + assert(pcm); + assert(pcm->p); + + pa_threaded_mainloop_lock(pcm->p->mainloop); + + if (pcm->stream) { + pa_stream_disconnect(pcm->stream); + pulse_wait_stream_state(pcm->p, pcm->stream, + PA_STREAM_TERMINATED); + pa_stream_unref(pcm->stream); + pcm->stream = NULL; + } + + err = pulse_check_connection(pcm->p); + if (err < 0) + goto finish; + + assert(pcm->stream == NULL); + + if (io->stream == SND_PCM_STREAM_PLAYBACK) + pcm->stream = + pa_stream_new(pcm->p->context, "ALSA Playback", + &pcm->ss, pa_channel_map_init_auto(&map, + pcm-> + ss. + channels, + PA_CHANNEL_MAP_ALSA)); + else + pcm->stream = + pa_stream_new(pcm->p->context, "ALSA Capture", + &pcm->ss, pa_channel_map_init_auto(&map, + pcm-> + ss. + channels, + PA_CHANNEL_MAP_ALSA)); + assert(pcm->stream); + + pa_stream_set_state_callback(pcm->stream, pulse_stream_state_cb, + pcm->p); + + if (io->stream == SND_PCM_STREAM_PLAYBACK) { + pa_stream_set_write_callback(pcm->stream, + stream_request_cb, pcm); + pa_stream_set_underflow_callback(pcm->stream, + stream_underrun_cb, pcm); + pa_stream_connect_playback(pcm->stream, pcm->device, + &pcm->buffer_attr, + PA_STREAM_AUTO_TIMING_UPDATE | + PA_STREAM_INTERPOLATE_TIMING, + NULL, NULL); + } else { + pa_stream_set_read_callback(pcm->stream, stream_request_cb, + pcm); + pa_stream_connect_record(pcm->stream, pcm->device, + &pcm->buffer_attr, + PA_STREAM_AUTO_TIMING_UPDATE | + PA_STREAM_INTERPOLATE_TIMING); + } + + err = + pulse_wait_stream_state(pcm->p, pcm->stream, PA_STREAM_READY); + if (err < 0) { + fprintf(stderr, + "*** PULSEAUDIO: Unable to create stream.\n"); + pa_stream_unref(pcm->stream); + pcm->stream = NULL; + goto finish; + } + + pcm->last_size = 0; + pcm->ptr = 0; + pcm->offset = 0; + pcm->underrun = 0; + + finish: + pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; } -static int pulse_hw_params(snd_pcm_ioplug_t *io, snd_pcm_hw_params_t *params) +static int pulse_hw_params(snd_pcm_ioplug_t * io, + snd_pcm_hw_params_t * params) { - snd_pcm_pulse_t *pcm = io->private_data; - snd_pcm_t *base = io->pcm; + snd_pcm_pulse_t *pcm = io->private_data; + snd_pcm_t *base = io->pcm; int err = 0; - assert(pcm); - assert(pcm->p); + assert(pcm); + assert(pcm->p); + + //Resolving bugtrack ID 0003470 + if (!base) { + switch (snd_pcm_state(base)) { + case SND_PCM_STATE_SETUP: + case SND_PCM_STATE_PREPARED: + break; + default: + assert(!pcm->stream); + break; + } + } - //Resolving bugtrack ID 0003470 - if (!base) { - switch (snd_pcm_state(base)) { - case SND_PCM_STATE_SETUP: - case SND_PCM_STATE_PREPARED: - break; + pa_threaded_mainloop_lock(pcm->p->mainloop); + + pcm->frame_size = + (snd_pcm_format_physical_width(io->format) * io->channels) / 8; + + switch (io->format) { + case SND_PCM_FORMAT_U8: + pcm->ss.format = PA_SAMPLE_U8; + break; + case SND_PCM_FORMAT_A_LAW: + pcm->ss.format = PA_SAMPLE_ALAW; + break; + case SND_PCM_FORMAT_MU_LAW: + pcm->ss.format = PA_SAMPLE_ULAW; + break; + case SND_PCM_FORMAT_S16_LE: + pcm->ss.format = PA_SAMPLE_S16LE; + break; + case SND_PCM_FORMAT_S16_BE: + pcm->ss.format = PA_SAMPLE_S16BE; + break; + case SND_PCM_FORMAT_FLOAT_LE: + pcm->ss.format = PA_SAMPLE_FLOAT32LE; + break; + case SND_PCM_FORMAT_FLOAT_BE: + pcm->ss.format = PA_SAMPLE_FLOAT32BE; + break; default: - assert(!pcm->stream); - break; + fprintf(stderr, "*** PULSEAUDIO: unsupported format %s\n", + snd_pcm_format_name(io->format)); + err = -EINVAL; + goto finish; } - } - - pa_threaded_mainloop_lock(pcm->p->mainloop); - - pcm->frame_size = (snd_pcm_format_physical_width(io->format) * io->channels) / 8; - - switch (io->format) { - case SND_PCM_FORMAT_U8: - pcm->ss.format = PA_SAMPLE_U8; - break; - case SND_PCM_FORMAT_A_LAW: - pcm->ss.format = PA_SAMPLE_ALAW; - break; - case SND_PCM_FORMAT_MU_LAW: - pcm->ss.format = PA_SAMPLE_ULAW; - break; - case SND_PCM_FORMAT_S16_LE: - pcm->ss.format = PA_SAMPLE_S16LE; - break; - case SND_PCM_FORMAT_S16_BE: - pcm->ss.format = PA_SAMPLE_S16BE; - break; - case SND_PCM_FORMAT_FLOAT_LE: - pcm->ss.format = PA_SAMPLE_FLOAT32LE; - break; - case SND_PCM_FORMAT_FLOAT_BE: - pcm->ss.format = PA_SAMPLE_FLOAT32BE; - break; - default: - fprintf(stderr, "*** PULSEAUDIO: unsupported format %s\n", - snd_pcm_format_name(io->format)); - err = -EINVAL; - goto finish; - } - - pcm->ss.rate = io->rate; - pcm->ss.channels = io->channels; - - pcm->buffer_attr.maxlength = (io->buffer_size*3)/2 * pcm->frame_size; - pcm->buffer_attr.tlength = io->buffer_size * pcm->frame_size; - pcm->buffer_attr.prebuf = (io->buffer_size - io->period_size) * pcm->frame_size; - pcm->buffer_attr.minreq = io->period_size * pcm->frame_size; - pcm->buffer_attr.fragsize = io->period_size * pcm->frame_size; - -finish: - pa_threaded_mainloop_unlock(pcm->p->mainloop); + + pcm->ss.rate = io->rate; + pcm->ss.channels = io->channels; + + pcm->buffer_attr.maxlength = + (io->buffer_size * 3) / 2 * pcm->frame_size; + pcm->buffer_attr.tlength = io->buffer_size * pcm->frame_size; + pcm->buffer_attr.prebuf = + (io->buffer_size - io->period_size) * pcm->frame_size; + pcm->buffer_attr.minreq = io->period_size * pcm->frame_size; + pcm->buffer_attr.fragsize = io->period_size * pcm->frame_size; + + finish: + pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; } -static int pulse_close(snd_pcm_ioplug_t *io) +static int pulse_close(snd_pcm_ioplug_t * io) { snd_pcm_pulse_t *pcm = io->private_data; - assert(pcm); + assert(pcm); - pa_threaded_mainloop_lock(pcm->p->mainloop); + pa_threaded_mainloop_lock(pcm->p->mainloop); - if (pcm->stream) { - pa_stream_disconnect(pcm->stream); - pulse_wait_stream_state(pcm->p, pcm->stream, PA_STREAM_TERMINATED); - pa_stream_unref(pcm->stream); - } + if (pcm->stream) { + pa_stream_disconnect(pcm->stream); + pulse_wait_stream_state(pcm->p, pcm->stream, + PA_STREAM_TERMINATED); + pa_stream_unref(pcm->stream); + } - pa_threaded_mainloop_unlock(pcm->p->mainloop); + pa_threaded_mainloop_unlock(pcm->p->mainloop); - if (pcm->p) - pulse_free(pcm->p); + if (pcm->p) + pulse_free(pcm->p); - if (pcm->device) - free(pcm->device); + if (pcm->device) + free(pcm->device); free(pcm); @@ -629,89 +671,98 @@ static int pulse_close(snd_pcm_ioplug_t *io) } static snd_pcm_ioplug_callback_t pulse_playback_callback = { - .start = pulse_start, - .stop = pulse_stop, - .drain = pulse_drain, - .pointer = pulse_pointer, - .transfer = pulse_write, - .delay = pulse_delay, - .poll_descriptors_count = pulse_pcm_poll_descriptors_count, - .poll_descriptors = pulse_pcm_poll_descriptors, - .poll_revents = pulse_pcm_poll_revents, - .prepare = pulse_prepare, - .hw_params = pulse_hw_params, - .close = pulse_close, + .start = pulse_start, + .stop = pulse_stop, + .drain = pulse_drain, + .pointer = pulse_pointer, + .transfer = pulse_write, + .delay = pulse_delay, + .poll_descriptors_count = pulse_pcm_poll_descriptors_count, + .poll_descriptors = pulse_pcm_poll_descriptors, + .poll_revents = pulse_pcm_poll_revents, + .prepare = pulse_prepare, + .hw_params = pulse_hw_params, + .close = pulse_close, }; static snd_pcm_ioplug_callback_t pulse_capture_callback = { - .start = pulse_start, - .stop = pulse_stop, - .pointer = pulse_pointer, - .transfer = pulse_read, - .delay = pulse_delay, - .poll_descriptors_count = pulse_pcm_poll_descriptors_count, - .poll_descriptors = pulse_pcm_poll_descriptors, - .poll_revents = pulse_pcm_poll_revents, - .prepare = pulse_prepare, - .hw_params = pulse_hw_params, - .close = pulse_close, + .start = pulse_start, + .stop = pulse_stop, + .pointer = pulse_pointer, + .transfer = pulse_read, + .delay = pulse_delay, + .poll_descriptors_count = pulse_pcm_poll_descriptors_count, + .poll_descriptors = pulse_pcm_poll_descriptors, + .poll_revents = pulse_pcm_poll_revents, + .prepare = pulse_prepare, + .hw_params = pulse_hw_params, + .close = pulse_close, }; -static int pulse_hw_constraint(snd_pcm_pulse_t *pcm) +static int pulse_hw_constraint(snd_pcm_pulse_t * pcm) { - snd_pcm_ioplug_t *io = &pcm->io; - - static const snd_pcm_access_t access_list[] = { - SND_PCM_ACCESS_RW_INTERLEAVED - }; - static const unsigned int formats[] = { - SND_PCM_FORMAT_U8, - SND_PCM_FORMAT_A_LAW, - SND_PCM_FORMAT_MU_LAW, - SND_PCM_FORMAT_S16_LE, - SND_PCM_FORMAT_S16_BE, - SND_PCM_FORMAT_FLOAT_LE, - SND_PCM_FORMAT_FLOAT_BE - }; - - int err; - - err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_ACCESS, - ARRAY_SIZE(access_list), access_list); - if (err < 0) - return err; - - err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_FORMAT, - ARRAY_SIZE(formats), formats); - if (err < 0) - return err; - - err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_CHANNELS, - 1, PA_CHANNELS_MAX); - if (err < 0) - return err; - - /* FIXME: Investigate actual min and max */ - err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_RATE, - 8000, 48000); - if (err < 0) - return err; - - err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_BUFFER_BYTES, - 1, 4 * 1024 * 1024); - if (err < 0) - return err; - - err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_PERIOD_BYTES, 256, 1024 * 1024); + snd_pcm_ioplug_t *io = &pcm->io; + + static const snd_pcm_access_t access_list[] = { + SND_PCM_ACCESS_RW_INTERLEAVED + }; + static const unsigned int formats[] = { + SND_PCM_FORMAT_U8, + SND_PCM_FORMAT_A_LAW, + SND_PCM_FORMAT_MU_LAW, + SND_PCM_FORMAT_S16_LE, + SND_PCM_FORMAT_S16_BE, + SND_PCM_FORMAT_FLOAT_LE, + SND_PCM_FORMAT_FLOAT_BE + }; + + int err; + + err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_ACCESS, + ARRAY_SIZE(access_list), + access_list); + if (err < 0) + return err; + + err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_FORMAT, + ARRAY_SIZE(formats), formats); + if (err < 0) + return err; + + err = + snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_CHANNELS, + 1, PA_CHANNELS_MAX); + if (err < 0) + return err; + + /* FIXME: Investigate actual min and max */ + err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_RATE, + 8000, 48000); if (err < 0) return err; - err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_PERIODS, 2, 1024); + err = + snd_pcm_ioplug_set_param_minmax(io, + SND_PCM_IOPLUG_HW_BUFFER_BYTES, + 1, 4 * 1024 * 1024); if (err < 0) return err; - return 0; + + err = + snd_pcm_ioplug_set_param_minmax(io, + SND_PCM_IOPLUG_HW_PERIOD_BYTES, + 256, 1024 * 1024); + if (err < 0) + return err; + + err = + snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_PERIODS, + 2, 1024); + if (err < 0) + return err; + return 0; } SND_PCM_PLUGIN_DEFINE_FUNC(pulse) @@ -727,40 +778,41 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) const char *id; if (snd_config_get_id(n, &id) < 0) continue; - if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) + if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 + || strcmp(id, "hint") == 0) + continue; + if (strcmp(id, "server") == 0) { + if (snd_config_get_string(n, &server) < 0) { + SNDERR("Invalid type for %s", id); + return -EINVAL; + } continue; - if (strcmp(id, "server") == 0) { - if (snd_config_get_string(n, &server) < 0) { - SNDERR("Invalid type for %s", id); - return -EINVAL; - } - continue; - } - if (strcmp(id, "device") == 0) { - if (snd_config_get_string(n, &device) < 0) { - SNDERR("Invalid type for %s", id); - return -EINVAL; - } - continue; - } + } + if (strcmp(id, "device") == 0) { + if (snd_config_get_string(n, &device) < 0) { + SNDERR("Invalid type for %s", id); + return -EINVAL; + } + continue; + } SNDERR("Unknown field %s", id); return -EINVAL; } pcm = calloc(1, sizeof(*pcm)); - if (device) - pcm->device = strdup(device); + if (device) + pcm->device = strdup(device); - pcm->p = pulse_new(); - if (!pcm->p) { - err = -EIO; - goto error; - } + pcm->p = pulse_new(); + if (!pcm->p) { + err = -EIO; + goto error; + } - err = pulse_connect(pcm->p, server); - if (err < 0) - goto error; + err = pulse_connect(pcm->p, server); + if (err < 0) + goto error; pcm->io.version = SND_PCM_IOPLUG_VERSION; pcm->io.name = "ALSA <-> PulseAudio PCM I/O Plugin"; @@ -768,25 +820,25 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) pcm->io.poll_events = 0; pcm->io.mmap_rw = 0; pcm->io.callback = stream == SND_PCM_STREAM_PLAYBACK ? - &pulse_playback_callback : &pulse_capture_callback; + &pulse_playback_callback : &pulse_capture_callback; pcm->io.private_data = pcm; err = snd_pcm_ioplug_create(&pcm->io, name, stream, mode); if (err < 0) goto error; - err = pulse_hw_constraint(pcm); - if (err < 0) { + err = pulse_hw_constraint(pcm); + if (err < 0) { snd_pcm_ioplug_delete(&pcm->io); - goto error; - } + goto error; + } *pcmp = pcm->io.pcm; return 0; -error: - if (pcm->p) - pulse_free(pcm->p); + error: + if (pcm->p) + pulse_free(pcm->p); free(pcm); |