[pulseaudio-commits] r1551 - in /branches/lennart/src: Makefile.am modules/alsa-util.c modules/alsa-util.h modules/module-alsa-sink.c modules/module-oss.c
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Sat Jul 28 10:24:28 PDT 2007
Author: lennart
Date: Sat Jul 28 19:24:28 2007
New Revision: 1551
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1551&root=3Dpulseaudio&vi=
ew=3Drev
Log:
port module-alsa-sink to new lock-free core. also add mmmap'ing support whi=
le doing so.
Modified:
branches/lennart/src/Makefile.am
branches/lennart/src/modules/alsa-util.c
branches/lennart/src/modules/alsa-util.h
branches/lennart/src/modules/module-alsa-sink.c
branches/lennart/src/modules/module-oss.c
Modified: branches/lennart/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/Makefile.a=
m?rev=3D1551&root=3Dpulseaudio&r1=3D1550&r2=3D1551&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/Makefile.am (original)
+++ branches/lennart/src/Makefile.am Sat Jul 28 19:24:28 2007
@@ -934,12 +934,12 @@
module-oss.la
endif
=
-#if HAVE_ALSA
-#modlibexec_LTLIBRARIES +=3D \
-# libalsa-util.la \
-# module-alsa-sink.la \
+if HAVE_ALSA
+modlibexec_LTLIBRARIES +=3D \
+ libalsa-util.la \
+ module-alsa-sink.la
# module-alsa-source.la
-#endif
+endif
=
if HAVE_SOLARIS
modlibexec_LTLIBRARIES +=3D \
@@ -1185,15 +1185,15 @@
=
# ALSA
=
-#libalsa_util_la_SOURCES =3D modules/alsa-util.c modules/alsa-util.h
-#libalsa_util_la_LDFLAGS =3D -avoid-version
-#libalsa_util_la_LIBADD =3D $(AM_LIBADD) $(ASOUNDLIB_LIBS) libpulsecore.la
-#libalsa_util_la_CFLAGS =3D $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
-
-#module_alsa_sink_la_SOURCES =3D modules/module-alsa-sink.c
-#module_alsa_sink_la_LDFLAGS =3D -module -avoid-version
-#module_alsa_sink_la_LIBADD =3D $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-uti=
l.la libpulsecore.la
-#module_alsa_sink_la_CFLAGS =3D $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
+libalsa_util_la_SOURCES =3D modules/alsa-util.c modules/alsa-util.h
+libalsa_util_la_LDFLAGS =3D -avoid-version
+libalsa_util_la_LIBADD =3D $(AM_LIBADD) $(ASOUNDLIB_LIBS) libpulsecore.la
+libalsa_util_la_CFLAGS =3D $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
+
+module_alsa_sink_la_SOURCES =3D modules/module-alsa-sink.c
+module_alsa_sink_la_LDFLAGS =3D -module -avoid-version
+module_alsa_sink_la_LIBADD =3D $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util=
.la libpulsecore.la
+module_alsa_sink_la_CFLAGS =3D $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
=
#module_alsa_source_la_SOURCES =3D modules/module-alsa-source.c
#module_alsa_source_la_LDFLAGS =3D -module -avoid-version
Modified: branches/lennart/src/modules/alsa-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/al=
sa-util.c?rev=3D1551&root=3Dpulseaudio&r1=3D1550&r2=3D1551&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/alsa-util.c (original)
+++ branches/lennart/src/modules/alsa-util.c Sat Jul 28 19:24:28 2007
@@ -35,219 +35,6 @@
#include <pulsecore/log.h>
=
#include "alsa-util.h"
-
-struct pa_alsa_fdlist {
- int num_fds;
- struct pollfd *fds;
- /* This is a temporary buffer used to avoid lots of mallocs */
- struct pollfd *work_fds;
-
- snd_pcm_t *pcm;
- snd_mixer_t *mixer;
-
- pa_mainloop_api *m;
- pa_defer_event *defer;
- pa_io_event **ios;
-
- int polled;
-
- void (*cb)(void *userdata);
- void *userdata;
-};
-
-static void io_cb(pa_mainloop_api*a, pa_io_event* e, PA_GCC_UNUSED int fd,=
pa_io_event_flags_t events, void *userdata) {
- struct pa_alsa_fdlist *fdl =3D (struct pa_alsa_fdlist*)userdata;
- int err, i;
- unsigned short revents;
-
- assert(a && fdl && (fdl->pcm || fdl->mixer) && fdl->fds && fdl->work_f=
ds);
-
- if (fdl->polled)
- return;
-
- fdl->polled =3D 1;
-
- memcpy(fdl->work_fds, fdl->fds, sizeof(struct pollfd) * fdl->num_fds);
-
- for (i =3D 0;i < fdl->num_fds;i++) {
- if (e =3D=3D fdl->ios[i]) {
- if (events & PA_IO_EVENT_INPUT)
- fdl->work_fds[i].revents |=3D POLLIN;
- if (events & PA_IO_EVENT_OUTPUT)
- fdl->work_fds[i].revents |=3D POLLOUT;
- if (events & PA_IO_EVENT_ERROR)
- fdl->work_fds[i].revents |=3D POLLERR;
- if (events & PA_IO_EVENT_HANGUP)
- fdl->work_fds[i].revents |=3D POLLHUP;
- break;
- }
- }
-
- assert(i !=3D fdl->num_fds);
-
- if (fdl->pcm)
- err =3D snd_pcm_poll_descriptors_revents(fdl->pcm, fdl->work_fds, =
fdl->num_fds, &revents);
- else
- err =3D snd_mixer_poll_descriptors_revents(fdl->mixer, fdl->work_f=
ds, fdl->num_fds, &revents);
-
- if (err < 0) {
- pa_log_error("Unable to get poll revent: %s",
- snd_strerror(err));
- return;
- }
-
- a->defer_enable(fdl->defer, 1);
-
- if (revents) {
- if (fdl->pcm)
- fdl->cb(fdl->userdata);
- else
- snd_mixer_handle_events(fdl->mixer);
- }
-}
-
-static void defer_cb(pa_mainloop_api*a, PA_GCC_UNUSED pa_defer_event* e, v=
oid *userdata) {
- struct pa_alsa_fdlist *fdl =3D (struct pa_alsa_fdlist*)userdata;
- int num_fds, i, err;
- struct pollfd *temp;
-
- assert(a && fdl && (fdl->pcm || fdl->mixer));
-
- a->defer_enable(fdl->defer, 0);
-
- if (fdl->pcm)
- num_fds =3D snd_pcm_poll_descriptors_count(fdl->pcm);
- else
- num_fds =3D snd_mixer_poll_descriptors_count(fdl->mixer);
- assert(num_fds > 0);
-
- if (num_fds !=3D fdl->num_fds) {
- if (fdl->fds)
- pa_xfree(fdl->fds);
- if (fdl->work_fds)
- pa_xfree(fdl->work_fds);
- fdl->fds =3D pa_xmalloc0(sizeof(struct pollfd) * num_fds);
- fdl->work_fds =3D pa_xmalloc(sizeof(struct pollfd) * num_fds);
- }
-
- memset(fdl->work_fds, 0, sizeof(struct pollfd) * num_fds);
-
- if (fdl->pcm)
- err =3D snd_pcm_poll_descriptors(fdl->pcm, fdl->work_fds, num_fds);
- else
- err =3D snd_mixer_poll_descriptors(fdl->mixer, fdl->work_fds, num_=
fds);
-
- if (err < 0) {
- pa_log_error("Unable to get poll descriptors: %s",
- snd_strerror(err));
- return;
- }
-
- fdl->polled =3D 0;
-
- if (memcmp(fdl->fds, fdl->work_fds, sizeof(struct pollfd) * num_fds) =
=3D=3D 0)
- return;
-
- if (fdl->ios) {
- for (i =3D 0;i < fdl->num_fds;i++)
- a->io_free(fdl->ios[i]);
- if (num_fds !=3D fdl->num_fds) {
- pa_xfree(fdl->ios);
- fdl->ios =3D pa_xmalloc(sizeof(pa_io_event*) * num_fds);
- assert(fdl->ios);
- }
- } else {
- fdl->ios =3D pa_xmalloc(sizeof(pa_io_event*) * num_fds);
- assert(fdl->ios);
- }
-
- /* Swap pointers */
- temp =3D fdl->work_fds;
- fdl->work_fds =3D fdl->fds;
- fdl->fds =3D temp;
-
- fdl->num_fds =3D num_fds;
-
- for (i =3D 0;i < num_fds;i++) {
- fdl->ios[i] =3D a->io_new(a, fdl->fds[i].fd,
- ((fdl->fds[i].events & POLLIN) ? PA_IO_EVENT_INPUT : 0) |
- ((fdl->fds[i].events & POLLOUT) ? PA_IO_EVENT_OUTPUT : 0),
- io_cb, fdl);
- assert(fdl->ios[i]);
- }
-}
-
-struct pa_alsa_fdlist *pa_alsa_fdlist_new(void) {
- struct pa_alsa_fdlist *fdl;
-
- fdl =3D pa_xmalloc(sizeof(struct pa_alsa_fdlist));
-
- fdl->num_fds =3D 0;
- fdl->fds =3D NULL;
- fdl->work_fds =3D NULL;
-
- fdl->pcm =3D NULL;
- fdl->mixer =3D NULL;
-
- fdl->m =3D NULL;
- fdl->defer =3D NULL;
- fdl->ios =3D NULL;
-
- fdl->polled =3D 0;
-
- return fdl;
-}
-
-void pa_alsa_fdlist_free(struct pa_alsa_fdlist *fdl) {
- assert(fdl);
-
- if (fdl->defer) {
- assert(fdl->m);
- fdl->m->defer_free(fdl->defer);
- }
-
- if (fdl->ios) {
- int i;
- assert(fdl->m);
- for (i =3D 0;i < fdl->num_fds;i++)
- fdl->m->io_free(fdl->ios[i]);
- pa_xfree(fdl->ios);
- }
-
- if (fdl->fds)
- pa_xfree(fdl->fds);
- if (fdl->work_fds)
- pa_xfree(fdl->work_fds);
-
- pa_xfree(fdl);
-}
-
-int pa_alsa_fdlist_init_pcm(struct pa_alsa_fdlist *fdl, snd_pcm_t *pcm_han=
dle, pa_mainloop_api* m, void (*cb)(void *userdata), void *userdata) {
- assert(fdl && pcm_handle && m && !fdl->m && cb);
-
- fdl->pcm =3D pcm_handle;
- fdl->m =3D m;
-
- fdl->defer =3D m->defer_new(m, defer_cb, fdl);
- assert(fdl->defer);
-
- fdl->cb =3D cb;
- fdl->userdata =3D userdata;
-
- return 0;
-}
-
-int pa_alsa_fdlist_init_mixer(struct pa_alsa_fdlist *fdl, snd_mixer_t *mix=
er_handle, pa_mainloop_api* m) {
- assert(fdl && mixer_handle && m && !fdl->m);
-
- fdl->mixer =3D mixer_handle;
- fdl->m =3D m;
-
- fdl->defer =3D m->defer_new(m, defer_cb, fdl);
- assert(fdl->defer);
-
- return 0;
-}
=
static int set_format(snd_pcm_t *pcm_handle, snd_pcm_hw_params_t *hwparams=
, pa_sample_format_t *f) {
=
@@ -308,7 +95,7 @@
=
/* Set the hardware parameters of the given ALSA device. Returns the
* selected fragment settings in *period and *period_size */
-int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, pa_sample_spec *ss, uint3=
2_t *periods, snd_pcm_uframes_t *period_size) {
+int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, pa_sample_spec *ss, uint3=
2_t *periods, snd_pcm_uframes_t *period_size, int *use_mmap) {
int ret =3D -1;
snd_pcm_uframes_t buffer_size;
unsigned int r =3D ss->rate;
@@ -325,10 +112,19 @@
=
if ((ret =3D snd_pcm_hw_params_malloc(&hwparams)) < 0 ||
(ret =3D snd_pcm_hw_params_any(pcm_handle, hwparams)) < 0 ||
- (ret =3D snd_pcm_hw_params_set_rate_resample(pcm_handle, hwparams,=
0)) < 0 ||
- (ret =3D snd_pcm_hw_params_set_access(pcm_handle, hwparams, SN=
D_PCM_ACCESS_RW_INTERLEAVED)) < 0)
- goto finish;
-
+ (ret =3D snd_pcm_hw_params_set_rate_resample(pcm_handle, hwparams,=
0)) < 0)
+ goto finish;
+
+ if (use_mmap && *use_mmap) {
+ if ((ret =3D snd_pcm_hw_params_set_access(pcm_handle, hwparams, SN=
D_PCM_ACCESS_MMAP_INTERLEAVED)) < 0)
+ if ((ret =3D snd_pcm_hw_params_set_access(pcm_handle, hwparams=
, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
+ goto finish;
+
+ } else if ((ret =3D snd_pcm_hw_params_set_access(pcm_handle, hwparams,=
SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) =
+ goto finish;
+ else if (*use_mmap)
+ *use_mmap =3D 0;
+ =
if ((ret =3D set_format(pcm_handle, hwparams, &f)) < 0)
goto finish;
=
Modified: branches/lennart/src/modules/alsa-util.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/al=
sa-util.h?rev=3D1551&root=3Dpulseaudio&r1=3D1550&r2=3D1551&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/alsa-util.h (original)
+++ branches/lennart/src/modules/alsa-util.h Sat Jul 28 19:24:28 2007
@@ -32,15 +32,7 @@
=
#include <pulse/channelmap.h>
=
-struct pa_alsa_fdlist;
-
-struct pa_alsa_fdlist *pa_alsa_fdlist_new(void);
-void pa_alsa_fdlist_free(struct pa_alsa_fdlist *fdl);
-
-int pa_alsa_fdlist_init_pcm(struct pa_alsa_fdlist *fdl, snd_pcm_t *pcm_han=
dle, pa_mainloop_api* m, void (*cb)(void *userdata), void *userdata);
-int pa_alsa_fdlist_init_mixer(struct pa_alsa_fdlist *fdl, snd_mixer_t *mix=
er_handle, pa_mainloop_api* m);
-
-int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, pa_sample_spec *ss, uint3=
2_t *periods, snd_pcm_uframes_t *period_size);
+int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, pa_sample_spec *ss, uint3=
2_t *periods, snd_pcm_uframes_t *period_size, int *use_mmap);
=
int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev);
snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, =
const char *fallback);
Modified: branches/lennart/src/modules/module-alsa-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/mo=
dule-alsa-sink.c?rev=3D1551&root=3Dpulseaudio&r1=3D1550&r2=3D1551&view=3Ddi=
ff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/module-alsa-sink.c (original)
+++ branches/lennart/src/modules/module-alsa-sink.c Sat Jul 28 19:24:28 2007
@@ -26,7 +26,6 @@
#include <config.h>
#endif
=
-#include <assert.h>
#include <stdio.h>
=
#ifdef HAVE_SYS_POLL_H
@@ -38,6 +37,7 @@
#include <asoundlib.h>
=
#include <pulse/xmalloc.h>
+#include <pulse/util.h>
=
#include <pulsecore/core.h>
#include <pulsecore/module.h>
@@ -47,6 +47,9 @@
#include <pulsecore/core-util.h>
#include <pulsecore/sample-util.h>
#include <pulsecore/log.h>
+#include <pulsecore/macro.h>
+#include <pulsecore/thread.h>
+#include <pulsecore/core-error.h>
=
#include "alsa-util.h"
#include "module-alsa-sink-symdef.h"
@@ -62,20 +65,36 @@
"rate=3D<sample rate> "
"fragments=3D<number of fragments> "
"fragment_size=3D<fragment size> "
- "channel_map=3D<channel map>")
+ "channel_map=3D<channel map> "
+ "mmap=3D<enable memory mapping?>")
+
+#define DEFAULT_DEVICE "default"
+
+#define DEFAULT_NFRAGS 4
+#define DEFAULT_FRAGSIZE_MSEC 25
=
struct userdata {
+ pa_core *core;
+ pa_module *module;
+ pa_sink *sink;
+ pa_thread *thread;
+ pa_asyncmsgq *asyncmsgq;
+ =
snd_pcm_t *pcm_handle;
- snd_mixer_t *mixer_handle;
- snd_mixer_elem_t *mixer_elem;
- pa_sink *sink;
- struct pa_alsa_fdlist *pcm_fdl;
- struct pa_alsa_fdlist *mixer_fdl;
- long hw_volume_max, hw_volume_min;
-
- size_t frame_size, fragment_size;
- pa_memchunk memchunk, silence;
- pa_module *module;
+
+/* snd_mixer_t *mixer_handle; */
+/* snd_mixer_elem_t *mixer_elem; */
+/* long hw_volume_max, hw_volume_min; */
+
+ size_t frame_size, fragment_size, hwbuf_size;
+ unsigned nfragments;
+ pa_memchunk memchunk;
+
+ char *device_name;
+
+ int use_mmap;
+
+ int first;
};
=
static const char* const valid_modargs[] =3D {
@@ -87,327 +106,601 @@
"fragments",
"fragment_size",
"channel_map",
+ "mmap",
NULL
};
=
-#define DEFAULT_DEVICE "default"
-
-static void update_usage(struct userdata *u) {
- pa_module_set_used(u->module, u->sink ? pa_sink_used_by(u->sink) : 0);
-}
-
-static void clear_up(struct userdata *u) {
- assert(u);
-
- if (u->sink) {
- pa_sink_disconnect(u->sink);
- pa_sink_unref(u->sink);
- u->sink =3D NULL;
- }
-
- if (u->pcm_fdl)
- pa_alsa_fdlist_free(u->pcm_fdl);
- if (u->mixer_fdl)
- pa_alsa_fdlist_free(u->mixer_fdl);
-
- u->pcm_fdl =3D u->mixer_fdl =3D NULL;
-
- if (u->mixer_handle) {
- snd_mixer_close(u->mixer_handle);
- u->mixer_handle =3D NULL;
- }
-
- if (u->pcm_handle) {
- snd_pcm_drop(u->pcm_handle);
- snd_pcm_close(u->pcm_handle);
- u->pcm_handle =3D NULL;
- }
-}
-
-static int xrun_recovery(struct userdata *u) {
- int ret;
- assert(u);
-
- pa_log_info("*** ALSA-XRUN (playback) ***");
-
- if ((ret =3D snd_pcm_prepare(u->pcm_handle)) < 0) {
- pa_log("snd_pcm_prepare() failed: %s", snd_strerror(-ret));
-
- clear_up(u);
- pa_module_unload_request(u->module);
- return -1;
- }
-
- return ret;
-}
-
-static int suspend_recovery(struct userdata *u) {
- int ret;
- assert(u);
-
- pa_log_info("*** ALSA-SUSPEND (playback) ***");
-
- if ((ret =3D snd_pcm_resume(u->pcm_handle)) < 0) {
- if (ret =3D=3D -EAGAIN)
- return -1;
-
- if (ret !=3D -ENOSYS)
- pa_log("snd_pcm_resume() failed: %s", snd_strerror(-ret));
- else {
- if ((ret =3D snd_pcm_prepare(u->pcm_handle)) < 0)
- pa_log("snd_pcm_prepare() failed: %s", snd_strerror(-ret));
- }
-
- if (ret < 0) {
- clear_up(u);
- pa_module_unload_request(u->module);
+static int mmap_write(struct userdata *u) {
+ snd_pcm_sframes_t n;
+ int err;
+ const snd_pcm_channel_area_t *areas;
+ snd_pcm_uframes_t offset, frames;
+ =
+ pa_assert(u);
+ pa_assert(u->sink);
+
+ for (;;) {
+ pa_memchunk chunk;
+ void *p;
+ =
+ if ((n =3D snd_pcm_avail_update(u->pcm_handle)) < 0) {
+
+ if (n =3D=3D -EPIPE) {
+ pa_log_debug("snd_pcm_avail_update: Buffer underrun!");
+ u->first =3D 1;
+ }
+ =
+ if ((err =3D snd_pcm_recover(u->pcm_handle, n, 1)) =3D=3D 0)
+ continue;
+
+ if (err =3D=3D EAGAIN)
+ return 0;
+ =
+ pa_log("snd_pcm_avail_update: %s", snd_strerror(n));
return -1;
}
- }
-
- return ret;
+
+/* pa_log("Got request for %i samples", (int) n); */
+ =
+ if (n <=3D 0)
+ return 0;
+
+ frames =3D n;
+ =
+ if ((err =3D snd_pcm_mmap_begin(u->pcm_handle, &areas, &offset, &f=
rames)) < 0) {
+ =
+ if (err =3D=3D -EPIPE) {
+ pa_log_debug("snd_pcm_mmap_begin: Buffer underrun!");
+ u->first =3D 1;
+ }
+
+ if ((err =3D snd_pcm_recover(u->pcm_handle, err, 1)) =3D=3D 0)
+ continue;
+
+ if (err =3D=3D EAGAIN)
+ return 0;
+
+ pa_log("Failed to write data to DSP: %s", snd_strerror(err));
+ return -1;
+ }
+
+ /* Check these are multiples of 8 bit */
+ pa_assert((areas[0].first & 7) =3D=3D 0);
+ pa_assert((areas[0].step & 7)=3D=3D 0);
+
+ /* We assume a single interleaved memory buffer */
+ pa_assert((areas[0].first >> 3) =3D=3D 0);
+ pa_assert((areas[0].step >> 3) =3D=3D u->frame_size);
+
+ p =3D (uint8_t*) areas[0].addr + (offset * u->frame_size);
+ =
+ chunk.memblock =3D pa_memblock_new_fixed(u->core->mempool, p, fram=
es * u->frame_size, 1);
+ chunk.length =3D pa_memblock_get_length(chunk.memblock);
+ chunk.index =3D 0;
+
+ pa_sink_render_into_full(u->sink, &chunk);
+
+ /* FIXME: Maybe we can do something to keep this memory block
+ * a little bit longer around? */
+ pa_memblock_unref_fixed(chunk.memblock);
+
+ if ((err =3D snd_pcm_mmap_commit(u->pcm_handle, offset, frames)) <=
0) {
+
+ if (err =3D=3D -EPIPE) {
+ pa_log_debug("snd_pcm_mmap_commit: Buffer underrun!");
+ u->first =3D 1;
+ }
+ =
+ if ((err =3D snd_pcm_recover(u->pcm_handle, err, 1)) =3D=3D 0)
+ continue;
+ =
+ if (err =3D=3D EAGAIN)
+ return 0;
+ =
+ pa_log("Failed to write data to DSP: %s", snd_strerror(err));
+ return -1;
+ }
+
+/* pa_log("wrote %i samples", (int) frames); */
+ }
}
=
-static void do_write(struct userdata *u) {
- assert(u);
-
- update_usage(u);
+static pa_usec_t sink_get_latency(struct userdata *u) {
+ pa_usec_t r =3D 0;
+ snd_pcm_sframes_t frames =3D 0;
+ int err;
+ =
+ pa_assert(u);
+
+ snd_pcm_avail_update(u->pcm_handle);
+
+ if ((err =3D snd_pcm_delay(u->pcm_handle, &frames)) < 0) {
+ pa_log("Failed to get delay: %s", snd_strerror(err));
+ return 0;
+ }
+
+ if (frames > 0)
+ r =3D pa_bytes_to_usec(frames * u->frame_size, &u->sink->sample_sp=
ec);
+ =
+ if (u->memchunk.memblock)
+ r +=3D pa_bytes_to_usec(u->memchunk.length, &u->sink->sample_spec);
+
+ return r;
+}
+
+static int suspend(struct userdata *u) {
+ pa_assert(u);
+ pa_assert(u->pcm_handle);
+
+ snd_pcm_drain(u->pcm_handle); /* Let's suspend */
+ snd_pcm_close(u->pcm_handle);
+ u->pcm_handle =3D NULL;
+
+ pa_log_debug("Device suspended...");
+ =
+ return 0;
+}
+
+static int unsuspend(struct userdata *u) {
+ pa_sample_spec ss;
+ int err, b;
+ unsigned nfrags;
+ snd_pcm_uframes_t period_size;
+
+ pa_assert(u);
+ pa_assert(!u->pcm_handle);
+
+ pa_log_debug("Trying resume...");
+
+ snd_config_update_free_global();
+ if ((err =3D snd_pcm_open(&u->pcm_handle, u->device_name, SND_PCM_STRE=
AM_PLAYBACK, SND_PCM_NONBLOCK)) < 0) {
+ pa_log("Error opening PCM device %s: %s", u->device_name, snd_stre=
rror(err));
+ goto fail;
+ }
+
+ ss =3D u->sink->sample_spec;
+ nfrags =3D u->nfragments;
+ period_size =3D u->fragment_size / u->frame_size;
+ b =3D u->use_mmap;
+ =
+ if ((err =3D pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &perio=
d_size, &b)) < 0) {
+ pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
+ goto fail;
+ }
+
+ if (b !=3D u->use_mmap) {
+ pa_log_warn("Resume failed, couldn't get original access mode.");
+ goto fail;
+ }
+
+ if (!pa_sample_spec_equal(&ss, &u->sink->sample_spec)) {
+ pa_log_warn("Resume failed, couldn't restore original sample setti=
ngs.");
+ goto fail;
+ }
+
+ if (!nfrags !=3D u->nfragments || period_size*u->frame_size !=3D u->fr=
agment_size) {
+ pa_log_warn("Resume failed, couldn't restore original fragment set=
tings.");
+ goto fail;
+ }
+
+ u->first =3D 1;
+ =
+ pa_log_debug("Resumed successfully...");
+
+ return 0;
+
+fail:
+ snd_pcm_close(u->pcm_handle);
+ u->pcm_handle =3D NULL;
+
+ return -1;
+}
+
+static int sink_process_msg(pa_msgobject *o, int code, void *data, pa_memc=
hunk *chunk) {
+ struct userdata *u =3D PA_SINK(o)->userdata;
+
+ switch (code) {
+
+ case PA_SINK_MESSAGE_GET_LATENCY: {
+ pa_usec_t r =3D 0;
+
+ if (u->pcm_handle)
+ r =3D sink_get_latency(u);
+
+ *((pa_usec_t*) data) =3D r;
+
+ break;
+ }
+
+ case PA_SINK_MESSAGE_SET_STATE:
+
+ if (PA_PTR_TO_UINT(data) =3D=3D PA_SINK_SUSPENDED) {
+ pa_assert(u->sink->thread_info.state !=3D PA_SINK_SUSPENDE=
D);
+
+ if (suspend(u) < 0)
+ return -1;
+ =
+ } else if (u->sink->thread_info.state =3D=3D PA_SINK_SUSPENDED=
) {
+ pa_assert(PA_PTR_TO_UINT(data) !=3D PA_SINK_SUSPENDED);
+
+ if (unsuspend(u) < 0)
+ return -1;
+ }
+ =
+ break;
+
+/* case PA_SINK_MESSAGE_SET_VOLUME: */
+
+/* if (u->use_pcm_volume && u->fd >=3D 0) { */
+
+/* if (pa_oss_set_pcm_volume(u->fd, &u->sink->sample_spec,=
((pa_cvolume*) data)) < 0) { */
+/* pa_log_info("Device doesn't support setting mixer s=
ettings: %s", pa_cstrerror(errno)); */
+/* u->use_pcm_volume =3D 0; */
+/* } else */
+/* return 0; */
+/* } */
+
+/* break; */
+
+/* case PA_SINK_MESSAGE_GET_VOLUME: */
+
+/* if (u->use_pcm_volume && u->fd >=3D 0) { */
+
+/* if (pa_oss_get_pcm_volume(u->fd, &u->sink->sample_spec,=
((pa_cvolume*) data)) < 0) { */
+/* pa_log_info("Device doesn't support reading mixer s=
ettings: %s", pa_cstrerror(errno)); */
+/* u->use_pcm_volume =3D 0; */
+/* } else */
+/* return 0; */
+/* } */
+
+/* break; */
+ }
+
+ return pa_sink_process_msg(o, code, data, chunk);
+}
+
+
+/* static int mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) { =
*/
+/* struct userdata *u =3D snd_mixer_elem_get_callback_private(elem); */
+
+/* pa_assert(u && u->mixer_handle); */
+
+/* if (mask =3D=3D SND_CTL_EVENT_MASK_REMOVE) */
+/* return 0; */
+
+/* if (mask & SND_CTL_EVENT_MASK_VALUE) { */
+/* if (u->sink->get_hw_volume) */
+/* u->sink->get_hw_volume(u->sink); */
+/* if (u->sink->get_hw_mute) */
+/* u->sink->get_hw_mute(u->sink); */
+/* pa_subscription_post(u->sink->core, */
+/* PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE, */
+/* u->sink->index); */
+/* } */
+
+/* return 0; */
+/* } */
+
+/* static int sink_get_hw_volume_cb(pa_sink *s) { */
+/* struct userdata *u =3D s->userdata; */
+/* int err; */
+/* int i; */
+
+/* pa_assert(u); */
+/* pa_assert(u->mixer_elem); */
+
+/* for (i =3D 0; i < s->hw_volume.channels; i++) { */
+/* long set_vol, vol; */
+
+/* pa_assert(snd_mixer_selem_has_playback_channel(u->mixer_elem, i=
)); */
+
+/* if ((err =3D snd_mixer_selem_get_playback_volume(u->mixer_elem,=
i, &vol)) < 0) */
+/* goto fail; */
+
+/* set_vol =3D (long) roundf(((float) s->hw_volume.values[i] * (u-=
>hw_volume_max - u->hw_volume_min)) / PA_VOLUME_NORM) + u->hw_volume_min; */
+
+/* /\* Try to avoid superfluous volume changes *\/ */
+/* if (set_vol !=3D vol) */
+/* s->hw_volume.values[i] =3D (pa_volume_t) roundf(((float) (v=
ol - u->hw_volume_min) * PA_VOLUME_NORM) / (u->hw_volume_max - u->hw_volume=
_min)); */
+/* } */
+
+/* return 0; */
+
+/* fail: */
+/* pa_log_error("Unable to read volume: %s", snd_strerror(err)); */
+/* s->get_hw_volume =3D NULL; */
+/* s->set_hw_volume =3D NULL; */
+/* return -1; */
+/* } */
+
+/* static int sink_set_hw_volume_cb(pa_sink *s) { */
+/* struct userdata *u =3D s->userdata; */
+/* int err; */
+/* int i; */
+/* pa_volume_t vol; */
+
+/* pa_assert(u); */
+/* pa_assert(u->mixer_elem); */
+
+/* for (i =3D 0; i < s->hw_volume.channels; i++) { */
+/* long alsa_vol; */
+
+/* pa_assert(snd_mixer_selem_has_playback_channel(u->mixer_elem, i=
)); */
+
+/* vol =3D s->hw_volume.values[i]; */
+
+/* if (vol > PA_VOLUME_NORM) */
+/* vol =3D PA_VOLUME_NORM; */
+
+/* alsa_vol =3D (long) roundf(((float) vol * (u->hw_volume_max - u=
->hw_volume_min)) / PA_VOLUME_NORM) + u->hw_volume_min; */
+
+/* if ((err =3D snd_mixer_selem_set_playback_volume(u->mixer_elem,=
i, alsa_vol)) < 0) */
+/* goto fail; */
+/* } */
+
+/* return 0; */
+
+/* fail: */
+/* pa_log_error("Unable to set volume: %s", snd_strerror(err)); */
+/* s->get_hw_volume =3D NULL; */
+/* s->set_hw_volume =3D NULL; */
+/* return -1; */
+/* } */
+
+/* static int sink_get_hw_mute_cb(pa_sink *s) { */
+/* struct userdata *u =3D s->userdata; */
+/* int err, sw; */
+
+/* pa_assert(u && u->mixer_elem); */
+
+/* err =3D snd_mixer_selem_get_playback_switch(u->mixer_elem, 0, &sw);=
*/
+/* if (err) { */
+/* pa_log_error("Unable to get switch: %s", snd_strerror(err)); */
+/* s->get_hw_mute =3D NULL; */
+/* s->set_hw_mute =3D NULL; */
+/* return -1; */
+/* } */
+
+/* s->hw_muted =3D !sw; */
+
+/* return 0; */
+/* } */
+
+/* static int sink_set_hw_mute_cb(pa_sink *s) { */
+/* struct userdata *u =3D s->userdata; */
+/* int err; */
+
+/* pa_assert(u && u->mixer_elem); */
+
+/* err =3D snd_mixer_selem_set_playback_switch_all(u->mixer_elem, !s->=
hw_muted); */
+/* if (err) { */
+/* pa_log_error("Unable to set switch: %s", snd_strerror(err)); */
+/* s->get_hw_mute =3D NULL; */
+/* s->set_hw_mute =3D NULL; */
+/* return -1; */
+/* } */
+
+/* return 0; */
+/* } */
+
+static void thread_func(void *userdata) {
+ enum {
+ POLLFD_ASYNCQ,
+ POLLFD_ALSA_BASE
+ };
+
+ struct userdata *u =3D userdata;
+ struct pollfd *pollfd =3D NULL;
+ int n_alsa_fds, err;
+ unsigned short revents =3D 0;
+ snd_pcm_status_t *status;
+
+ pa_assert(u);
+ snd_pcm_status_alloca(&status);
+
+ pa_log_debug("Thread starting up");
+
+ if ((n_alsa_fds =3D snd_pcm_poll_descriptors_count(u->pcm_handle)) < 0=
) {
+ pa_log("snd_pcm_poll_descriptors_count() failed: %s", snd_strerror=
(n_alsa_fds));
+ goto fail;
+ }
+
+ pollfd =3D pa_xnew0(struct pollfd, POLLFD_ALSA_BASE + n_alsa_fds);
+
+ pollfd[POLLFD_ASYNCQ].fd =3D pa_asyncmsgq_get_fd(u->asyncmsgq);
+ pollfd[POLLFD_ASYNCQ].events =3D POLLIN;
+
+ if ((err =3D snd_pcm_poll_descriptors(u->pcm_handle, pollfd+POLLFD_ALS=
A_BASE, n_alsa_fds)) < 0) {
+ pa_log("snd_pcm_poll_descriptors() failed: %s", snd_strerror(err));
+ goto fail;
+ }
=
for (;;) {
- void *p;
- pa_memchunk *memchunk =3D NULL;
- snd_pcm_sframes_t frames;
-
- if (u->memchunk.memblock)
- memchunk =3D &u->memchunk;
- else {
- if (pa_sink_render(u->sink, u->fragment_size, &u->memchunk) < =
0)
- memchunk =3D &u->silence;
- else
- memchunk =3D &u->memchunk;
- }
- assert(memchunk->memblock);
- assert(memchunk->length);
- assert((memchunk->length % u->frame_size) =3D=3D 0);
-
- p =3D pa_memblock_acquire(memchunk->memblock);
-
- if ((frames =3D snd_pcm_writei(u->pcm_handle, (uint8_t*) p + memch=
unk->index, memchunk->length / u->frame_size)) < 0) {
- pa_memblock_release(memchunk->memblock);
-
- if (frames =3D=3D -EAGAIN)
- return;
-
- if (frames =3D=3D -EPIPE) {
- if (xrun_recovery(u) < 0)
- return;
-
+ pa_msgobject *object;
+ int code;
+ void *data;
+ pa_memchunk chunk;
+ int r;
+
+/* pa_log("loop"); */
+ =
+ /* Check whether there is a message for us to process */
+ if (pa_asyncmsgq_get(u->asyncmsgq, &object, &code, &data, &chunk, =
0) =3D=3D 0) {
+ int ret;
+
+/* pa_log("processing msg"); */
+
+ if (!object && code =3D=3D PA_MESSAGE_SHUTDOWN) {
+ pa_asyncmsgq_done(u->asyncmsgq, 0);
+ goto finish;
+ }
+
+ ret =3D pa_asyncmsgq_dispatch(object, code, data, &chunk);
+ pa_asyncmsgq_done(u->asyncmsgq, ret);
+ continue;
+ } =
+
+/* pa_log("loop2"); */
+
+ /* Render some data and write it to the dsp */
+
+ if (u->sink->thread_info.state !=3D PA_SINK_SUSPENDED && ((revents=
& POLLOUT) || u->first =3D=3D 1)) {
+
+ if (u->use_mmap) {
+ int ret;
+
+ if ((ret =3D mmap_write(u)) < 0)
+ goto fail;
+
+ revents &=3D ~POLLOUT;
+ =
+ if (ret > 0)
+ continue;
+
+ } else {
+ ssize_t l;
+
+ snd_pcm_hwsync(u->pcm_handle);
+ if ((err =3D snd_pcm_status(u->pcm_handle, status)) >=3D 0)
+ l =3D snd_pcm_status_get_avail(status) * u->frame_size;
+ else
+ l =3D u->fragment_size;
+ =
+ do {
+ void *p;
+ snd_pcm_sframes_t t;
+ =
+ pa_assert(l > 0);
+ =
+ if (u->memchunk.length <=3D 0)
+ pa_sink_render(u->sink, l, &u->memchunk);
+ =
+ pa_assert(u->memchunk.length > 0);
+ =
+ p =3D pa_memblock_acquire(u->memchunk.memblock);
+ t =3D snd_pcm_writei(u->pcm_handle, (uint8_t*) p + u->=
memchunk.index, u->memchunk.length / u->frame_size);
+ pa_memblock_release(u->memchunk.memblock);
+ =
+/* pa_log("wrote %i bytes of %u", t, l); */
+ =
+ pa_assert(t !=3D 0);
+ =
+ if (t < 0) {
+
+ if (t =3D=3D -EPIPE) {
+ pa_log_debug("Buffer underrun!");
+ u->first =3D 1;
+ }
+ =
+ if ((t =3D snd_pcm_recover(u->pcm_handle, t, 1)) =
=3D=3D 0)
+ continue;
+ =
+ if (t =3D=3D EAGAIN) {
+ pa_log_debug("EAGAIN"); =
+ =
+ revents &=3D ~POLLOUT;
+ break;
+ =
+ } else {
+ pa_log("Failed to write data to DSP: %s", snd_=
strerror(t));
+ goto fail;
+ }
+ =
+ } else {
+ =
+ u->memchunk.index +=3D t * u->frame_size;
+ u->memchunk.length -=3D t * u->frame_size;
+ =
+ if (u->memchunk.length <=3D 0) {
+ pa_memblock_unref(u->memchunk.memblock);
+ pa_memchunk_reset(&u->memchunk);
+ }
+ =
+ l -=3D t * u->frame_size;
+ =
+ revents &=3D ~POLLOUT;
+ }
+ =
+ } while (l > 0);
+ =
continue;
}
=
- if (frames =3D=3D -ESTRPIPE) {
- if (suspend_recovery(u) < 0)
- return;
-
+ if (u->first) {
+ pa_log_info("Starting playback.");
+ =
+ if ((err =3D snd_pcm_start(u->pcm_handle)) < 0) {
+ pa_log("Failed to start PCM playback: %s", snd_strerro=
r(err));
+ goto fail;
+ }
+
+ u->first =3D 0;
+ }
+ }
+
+ /* Hmm, nothing to do. Let's sleep */
+ if (pa_asyncmsgq_before_poll(u->asyncmsgq) < 0)
+ continue;
+
+/* pa_log("polling for %i", POLLFD_ALSA_BASE + (u->sink->thread_in=
fo.state !=3D PA_SINK_SUSPENDED ? n_alsa_fds : 0)); */
+ r =3D poll(pollfd, POLLFD_ALSA_BASE + (u->sink->thread_info.state =
!=3D PA_SINK_SUSPENDED ? n_alsa_fds : 0), -1);
+ /*pa_log("polling got dsp=3D%i amq=3D%i (%i)", r > 0 ? pollfd[POLL=
FD_DSP].revents : 0, r > 0 ? pollfd[POLLFD_ASYNCQ].revents : 0, r); */
+/* pa_log("poll end"); */
+
+ pa_asyncmsgq_after_poll(u->asyncmsgq);
+
+ if (r < 0) {
+ if (errno =3D=3D EINTR) {
+ pollfd[POLLFD_ASYNCQ].revents =3D 0;
+ revents =3D 0;
continue;
}
=
- pa_log("snd_pcm_writei() failed: %s", snd_strerror(-frames));
-
- clear_up(u);
- pa_module_unload_request(u->module);
- return;
+ pa_log("poll() failed: %s", pa_cstrerror(errno));
+ goto fail;
}
=
- pa_memblock_release(memchunk->memblock);
-
- if (memchunk =3D=3D &u->memchunk) {
- size_t l =3D frames * u->frame_size;
- memchunk->index +=3D l;
- memchunk->length -=3D l;
-
- if (memchunk->length =3D=3D 0) {
- pa_memblock_unref(memchunk->memblock);
- memchunk->memblock =3D NULL;
- memchunk->index =3D memchunk->length =3D 0;
+ pa_assert(r > 0);
+
+ if (u->sink->thread_info.state !=3D PA_SINK_SUSPENDED) {
+ if ((err =3D snd_pcm_poll_descriptors_revents(u->pcm_handle, p=
ollfd + POLLFD_ALSA_BASE, n_alsa_fds, &revents)) < 0) {
+ pa_log("snd_pcm_poll_descriptors_revents() failed: %s", sn=
d_strerror(err));
+ goto fail;
}
+
+/* pa_log("got alsa event"); */
+ } else
+ revents =3D 0;
+ =
+ if (revents & ~(POLLOUT|POLLERR)) {
+ pa_log("DSP shutdown.");
+ goto fail;
}
=
- break;
- }
+ pa_assert((pollfd[POLLFD_ASYNCQ].revents & ~POLLIN) =3D=3D 0);
+ }
+
+fail:
+ /* We have to continue processing messages until we receive the
+ * SHUTDOWN message */
+ pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_M=
ESSAGE_UNLOAD_MODULE, u->module, NULL, NULL);
+ pa_asyncmsgq_wait_for(u->asyncmsgq, PA_MESSAGE_SHUTDOWN);
+
+finish:
+ pa_log_debug("Thread shutting down");
+
+ pa_xfree(pollfd);
}
=
-static void fdl_callback(void *userdata) {
- struct userdata *u =3D userdata;
- assert(u);
-
- if (snd_pcm_state(u->pcm_handle) =3D=3D SND_PCM_STATE_XRUN)
- if (xrun_recovery(u) < 0)
- return;
-
- if (snd_pcm_state(u->pcm_handle) =3D=3D SND_PCM_STATE_SUSPENDED)
- if (suspend_recovery(u) < 0)
- return;
-
- do_write(u);
-}
-
-static int mixer_callback(snd_mixer_elem_t *elem, unsigned int mask) {
- struct userdata *u =3D snd_mixer_elem_get_callback_private(elem);
-
- assert(u && u->mixer_handle);
-
- if (mask =3D=3D SND_CTL_EVENT_MASK_REMOVE)
- return 0;
-
- if (mask & SND_CTL_EVENT_MASK_VALUE) {
- if (u->sink->get_hw_volume)
- u->sink->get_hw_volume(u->sink);
- if (u->sink->get_hw_mute)
- u->sink->get_hw_mute(u->sink);
- pa_subscription_post(u->sink->core,
- PA_SUBSCRIPTION_EVENT_SINK|PA_SUBSCRIPTION_EVENT_CHANGE,
- u->sink->index);
- }
-
- return 0;
-}
-
-static pa_usec_t sink_get_latency_cb(pa_sink *s) {
- pa_usec_t r =3D 0;
- struct userdata *u =3D s->userdata;
- snd_pcm_sframes_t frames;
- int err;
-
- assert(s && u && u->sink);
-
- if ((err =3D snd_pcm_delay(u->pcm_handle, &frames)) < 0) {
- pa_log("failed to get delay: %s", snd_strerror(err));
- s->get_latency =3D NULL;
- return 0;
- }
-
- if (frames < 0)
- frames =3D 0;
-
- r +=3D pa_bytes_to_usec(frames * u->frame_size, &s->sample_spec);
-
- if (u->memchunk.memblock)
- r +=3D pa_bytes_to_usec(u->memchunk.length, &s->sample_spec);
-
- return r;
-}
-
-static int sink_get_hw_volume_cb(pa_sink *s) {
- struct userdata *u =3D s->userdata;
- int err;
- int i;
-
- assert(u);
- assert(u->mixer_elem);
-
- for (i =3D 0; i < s->hw_volume.channels; i++) {
- long set_vol, vol;
-
- assert(snd_mixer_selem_has_playback_channel(u->mixer_elem, i));
-
- if ((err =3D snd_mixer_selem_get_playback_volume(u->mixer_elem, i,=
&vol)) < 0)
- goto fail;
-
- set_vol =3D (long) roundf(((float) s->hw_volume.values[i] * (u->hw=
_volume_max - u->hw_volume_min)) / PA_VOLUME_NORM) + u->hw_volume_min;
-
- /* Try to avoid superfluous volume changes */
- if (set_vol !=3D vol)
- s->hw_volume.values[i] =3D (pa_volume_t) roundf(((float) (vol =
- u->hw_volume_min) * PA_VOLUME_NORM) / (u->hw_volume_max - u->hw_volume_mi=
n));
- }
-
- return 0;
-
-fail:
- pa_log_error("Unable to read volume: %s", snd_strerror(err));
- s->get_hw_volume =3D NULL;
- s->set_hw_volume =3D NULL;
- return -1;
-}
-
-static int sink_set_hw_volume_cb(pa_sink *s) {
- struct userdata *u =3D s->userdata;
- int err;
- int i;
- pa_volume_t vol;
-
- assert(u);
- assert(u->mixer_elem);
-
- for (i =3D 0; i < s->hw_volume.channels; i++) {
- long alsa_vol;
-
- assert(snd_mixer_selem_has_playback_channel(u->mixer_elem, i));
-
- vol =3D s->hw_volume.values[i];
-
- if (vol > PA_VOLUME_NORM)
- vol =3D PA_VOLUME_NORM;
-
- alsa_vol =3D (long) roundf(((float) vol * (u->hw_volume_max - u->h=
w_volume_min)) / PA_VOLUME_NORM) + u->hw_volume_min;
-
- if ((err =3D snd_mixer_selem_set_playback_volume(u->mixer_elem, i,=
alsa_vol)) < 0)
- goto fail;
- }
-
- return 0;
-
-fail:
- pa_log_error("Unable to set volume: %s", snd_strerror(err));
- s->get_hw_volume =3D NULL;
- s->set_hw_volume =3D NULL;
- return -1;
-}
-
-static int sink_get_hw_mute_cb(pa_sink *s) {
- struct userdata *u =3D s->userdata;
- int err, sw;
-
- assert(u && u->mixer_elem);
-
- err =3D snd_mixer_selem_get_playback_switch(u->mixer_elem, 0, &sw);
- if (err) {
- pa_log_error("Unable to get switch: %s", snd_strerror(err));
- s->get_hw_mute =3D NULL;
- s->set_hw_mute =3D NULL;
- return -1;
- }
-
- s->hw_muted =3D !sw;
-
- return 0;
-}
-
-static int sink_set_hw_mute_cb(pa_sink *s) {
- struct userdata *u =3D s->userdata;
- int err;
-
- assert(u && u->mixer_elem);
-
- err =3D snd_mixer_selem_set_playback_switch_all(u->mixer_elem, !s->hw_=
muted);
- if (err) {
- pa_log_error("Unable to set switch: %s", snd_strerror(err));
- s->get_hw_mute =3D NULL;
- s->set_hw_mute =3D NULL;
- return -1;
- }
-
- return 0;
-}
-
int pa__init(pa_core *c, pa_module*m) {
+ =
pa_modargs *ma =3D NULL;
int ret =3D -1;
struct userdata *u =3D NULL;
const char *dev;
pa_sample_spec ss;
pa_channel_map map;
- uint32_t periods, fragsize;
+ uint32_t nfrags, frag_size;
snd_pcm_uframes_t period_size;
size_t frame_size;
snd_pcm_info_t *pcm_info =3D NULL;
@@ -416,6 +709,10 @@
const char *name;
char *name_buf =3D NULL;
int namereg_fail;
+ int use_mmap =3D 1, b;
+
+ pa_assert(c);
+ pa_assert(m);
=
if (!(ma =3D pa_modargs_new(m->argument, valid_modargs))) {
pa_log("failed to parse module arguments");
@@ -430,19 +727,29 @@
=
frame_size =3D pa_frame_size(&ss);
=
- /* Fix latency to 100ms */
- periods =3D 8;
- fragsize =3D pa_bytes_per_second(&ss)/128;
-
- if (pa_modargs_get_value_u32(ma, "fragments", &periods) < 0 || pa_moda=
rgs_get_value_u32(ma, "fragment_size", &fragsize) < 0) {
+ nfrags =3D DEFAULT_NFRAGS;
+ frag_size =3D pa_usec_to_bytes(DEFAULT_FRAGSIZE_MSEC*1000, &ss);
+ if (frag_size <=3D 0)
+ frag_size =3D frame_size;
+
+ if (pa_modargs_get_value_u32(ma, "fragments", &nfrags) < 0 || pa_modar=
gs_get_value_u32(ma, "fragment_size", &frag_size) < 0) {
pa_log("failed to parse buffer metrics");
goto fail;
}
- period_size =3D fragsize/frame_size;
-
+ period_size =3D frag_size/frame_size;
+
+ if (pa_modargs_get_value_boolean(ma, "mmap", &use_mmap) < 0) {
+ pa_log("Failed to parse mmap argument.");
+ goto fail;
+ }
+ =
u =3D pa_xnew0(struct userdata, 1);
+ u->core =3D c;
+ u->module =3D m;
m->userdata =3D u;
- u->module =3D m;
+ u->use_mmap =3D use_mmap;
+ u->first =3D 1;
+ pa_assert_se(u->asyncmsgq =3D pa_asyncmsgq_new(0));
=
snd_config_update_free_global();
if ((err =3D snd_pcm_open(&u->pcm_handle, dev =3D pa_modargs_get_value=
(ma, "device", DEFAULT_DEVICE), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK))=
< 0) {
@@ -450,15 +757,23 @@
goto fail;
}
=
+ u->device_name =3D pa_xstrdup(dev);
+
if ((err =3D snd_pcm_info_malloc(&pcm_info)) < 0 ||
(err =3D snd_pcm_info(u->pcm_handle, pcm_info)) < 0) {
pa_log("Error fetching PCM info: %s", snd_strerror(err));
goto fail;
}
=
- if ((err =3D pa_alsa_set_hw_params(u->pcm_handle, &ss, &periods, &peri=
od_size)) < 0) {
+ b =3D use_mmap;
+ if ((err =3D pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &perio=
d_size, &b)) < 0) {
pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
goto fail;
+ }
+
+ if (use_mmap && !b) {
+ pa_log_info("Device doesn't support mmap(), falling back to UNIX r=
ead/write mode.");
+ u->use_mmap =3D use_mmap =3D b;
}
=
/* ALSA might tweak the sample spec, so recalculate the frame size */
@@ -468,16 +783,16 @@
/* Seems ALSA didn't like the channel number, so let's fix the cha=
nnel map */
pa_channel_map_init_auto(&map, ss.channels, PA_CHANNEL_MAP_ALSA);
=
- if ((err =3D snd_mixer_open(&u->mixer_handle, 0)) < 0) {
- pa_log("Error opening mixer: %s", snd_strerror(err));
- goto fail;
- }
-
- if ((pa_alsa_prepare_mixer(u->mixer_handle, dev) < 0) ||
- !(u->mixer_elem =3D pa_alsa_find_elem(u->mixer_handle, "PCM", "Mas=
ter"))) {
- snd_mixer_close(u->mixer_handle);
- u->mixer_handle =3D NULL;
- }
+/* if ((err =3D snd_mixer_open(&u->mixer_handle, 0)) < 0) */
+/* pa_log_warn("Error opening mixer: %s", snd_strerror(err)); */
+/* else { */
+
+/* if ((pa_alsa_prepare_mixer(u->mixer_handle, dev) < 0) || */
+/* !(u->mixer_elem =3D pa_alsa_find_elem(u->mixer_handle, "PCM=
", "Master"))) { */
+/* snd_mixer_close(u->mixer_handle); */
+/* u->mixer_handle =3D NULL; */
+/* } */
+/* } */
=
if ((name =3D pa_modargs_get_value(ma, "sink_name", NULL)))
namereg_fail =3D 1;
@@ -486,83 +801,85 @@
namereg_fail =3D 0;
}
=
- if (!(u->sink =3D pa_sink_new(c, __FILE__, name, namereg_fail, &ss, &m=
ap))) {
+ u->sink =3D pa_sink_new(c, __FILE__, name, namereg_fail, &ss, &map);
+ pa_xfree(name_buf);
+ =
+ if (!u->sink) {
pa_log("Failed to create sink object");
goto fail;
}
=
+ u->sink->parent.process_msg =3D sink_process_msg;
+ u->sink->userdata =3D u;
+
+ pa_sink_set_module(u->sink, m);
+ pa_sink_set_asyncmsgq(u->sink, u->asyncmsgq);
+ pa_sink_set_description(u->sink, t =3D pa_sprintf_malloc(
+ "ALSA PCM on %s (%s)",
+ dev,
+ snd_pcm_info_get_name(pcm_info)));
+ pa_xfree(t);
+ =
u->sink->is_hardware =3D 1;
- u->sink->get_latency =3D sink_get_latency_cb;
- if (u->mixer_handle) {
- assert(u->mixer_elem);
- if (snd_mixer_selem_has_playback_volume(u->mixer_elem)) {
- int i;
-
- for (i =3D 0;i < ss.channels;i++) {
- if (!snd_mixer_selem_has_playback_channel(u->mixer_elem, i=
))
- break;
- }
-
- if (i =3D=3D ss.channels) {
- u->sink->get_hw_volume =3D sink_get_hw_volume_cb;
- u->sink->set_hw_volume =3D sink_set_hw_volume_cb;
- snd_mixer_selem_get_playback_volume_range(
- u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max);
- }
- }
- if (snd_mixer_selem_has_playback_switch(u->mixer_elem)) {
- u->sink->get_hw_mute =3D sink_get_hw_mute_cb;
- u->sink->set_hw_mute =3D sink_set_hw_mute_cb;
- }
- }
- u->sink->userdata =3D u;
- pa_sink_set_owner(u->sink, m);
- pa_sink_set_description(u->sink, t =3D pa_sprintf_malloc("ALSA PCM on =
%s (%s)", dev, snd_pcm_info_get_name(pcm_info)));
- pa_xfree(t);
-
- u->pcm_fdl =3D pa_alsa_fdlist_new();
- assert(u->pcm_fdl);
- if (pa_alsa_fdlist_init_pcm(u->pcm_fdl, u->pcm_handle, c->mainloop, fd=
l_callback, u) < 0) {
- pa_log("failed to initialise file descriptor monitoring");
- goto fail;
- }
-
- if (u->mixer_handle) {
- u->mixer_fdl =3D pa_alsa_fdlist_new();
- assert(u->mixer_fdl);
- if (pa_alsa_fdlist_init_mixer(u->mixer_fdl, u->mixer_handle, c->ma=
inloop) < 0) {
- pa_log("failed to initialise file descriptor monitoring");
- goto fail;
- }
- snd_mixer_elem_set_callback(u->mixer_elem, mixer_callback);
- snd_mixer_elem_set_callback_private(u->mixer_elem, u);
- } else
- u->mixer_fdl =3D NULL;
+ =
+/* if (u->mixer_handle) { */
+/* pa_assert(u->mixer_elem); */
+/* if (snd_mixer_selem_has_playback_volume(u->mixer_elem)) { */
+/* int i; */
+
+/* for (i =3D 0;i < ss.channels;i++) { */
+/* if (!snd_mixer_selem_has_playback_channel(u->mixer_elem=
, i)) */
+/* break; */
+/* } */
+
+/* if (i =3D=3D ss.channels) { */
+/* u->sink->get_hw_volume =3D sink_get_hw_volume_cb; */
+/* u->sink->set_hw_volume =3D sink_set_hw_volume_cb; */
+/* snd_mixer_selem_get_playback_volume_range( */
+/* u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max=
); */
+/* } */
+/* } */
+/* if (snd_mixer_selem_has_playback_switch(u->mixer_elem)) { */
+/* u->sink->get_hw_mute =3D sink_get_hw_mute_cb; */
+/* u->sink->set_hw_mute =3D sink_set_hw_mute_cb; */
+/* } */
+/* } */
+
+/* if (u->mixer_handle) { */
+/* u->mixer_fdl =3D pa_alsa_fdlist_new(); */
+/* pa_assert(u->mixer_fdl); */
+/* if (pa_alsa_fdlist_init_mixer(u->mixer_fdl, u->mixer_handle, c-=
>mainloop) < 0) { */
+/* pa_log("failed to initialise file descriptor monitoring"); =
*/
+/* goto fail; */
+/* } */
+/* snd_mixer_elem_set_callback(u->mixer_elem, mixer_callback); */
+/* snd_mixer_elem_set_callback_private(u->mixer_elem, u); */
+/* } else */
+/* u->mixer_fdl =3D NULL; */
=
u->frame_size =3D frame_size;
u->fragment_size =3D period_size * frame_size;
-
- pa_log_info("using %u fragments of size %lu bytes.", periods, (long un=
signed)u->fragment_size);
-
- u->silence.memblock =3D pa_memblock_new(c->mempool, u->silence.length =
=3D u->fragment_size);
- assert(u->silence.memblock);
- pa_silence_memblock(u->silence.memblock, &ss);
- u->silence.index =3D 0;
-
- u->memchunk.memblock =3D NULL;
- u->memchunk.index =3D u->memchunk.length =3D 0;
+ u->nfragments =3D nfrags;
+ u->hwbuf_size =3D u->fragment_size * nfrags;
+
+ pa_log_info("Using %u fragments of size %lu bytes.", nfrags, (long uns=
igned) u->fragment_size);
+
+ pa_memchunk_reset(&u->memchunk);
+
+ if (!(u->thread =3D pa_thread_new(thread_func, u))) {
+ pa_log("Failed to create thread.");
+ goto fail;
+ }
+ =
+ /* Get initial mixer settings */
+ if (u->sink->get_volume)
+ u->sink->get_volume(u->sink);
+ if (u->sink->get_mute)
+ u->sink->get_mute(u->sink);
=
ret =3D 0;
=
- /* Get initial mixer settings */
- if (u->sink->get_hw_volume)
- u->sink->get_hw_volume(u->sink);
- if (u->sink->get_hw_mute)
- u->sink->get_hw_mute(u->sink);
-
finish:
-
- pa_xfree(name_buf);
=
if (ma)
pa_modargs_free(ma);
@@ -582,18 +899,42 @@
=
void pa__done(pa_core *c, pa_module*m) {
struct userdata *u;
- assert(c && m);
+ =
+ pa_assert(c);
+ pa_assert(m);
=
if (!(u =3D m->userdata))
return;
=
- clear_up(u);
-
+ if (u->sink)
+ pa_sink_disconnect(u->sink);
+
+ if (u->thread) {
+ pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, N=
ULL);
+ pa_thread_free(u->thread);
+ }
+
+ if (u->asyncmsgq)
+ pa_asyncmsgq_free(u->asyncmsgq);
+
+ if (u->sink)
+ pa_sink_unref(u->sink);
+ =
if (u->memchunk.memblock)
pa_memblock_unref(u->memchunk.memblock);
- if (u->silence.memblock)
- pa_memblock_unref(u->silence.memblock);
-
+ =
+/* if (u->mixer_handle) */
+/* snd_mixer_close(u->mixer_handle); */
+
+ if (u->pcm_handle) {
+ snd_pcm_drop(u->pcm_handle);
+ snd_pcm_close(u->pcm_handle);
+ }
+ =
+ pa_xfree(u->device_name);
+
+ snd_config_update_free_global();
+ =
pa_xfree(u);
}
=
Modified: branches/lennart/src/modules/module-oss.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/mo=
dule-oss.c?rev=3D1551&root=3Dpulseaudio&r1=3D1550&r2=3D1551&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/modules/module-oss.c (original)
+++ branches/lennart/src/modules/module-oss.c Sat Jul 28 19:24:28 2007
@@ -48,9 +48,14 @@
#include <sys/mman.h>
#endif
=
+#ifdef HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#else
+#include "poll.h"
+#endif
+
#include <sys/soundcard.h>
#include <sys/ioctl.h>
-#include <sys/poll.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <stdio.h>
@@ -73,6 +78,7 @@
#include <pulsecore/core-util.h>
#include <pulsecore/modargs.h>
#include <pulsecore/log.h>
+#include <pulsecore/macro.h>
=
#include "oss-util.h"
#include "module-oss-symdef.h"
@@ -805,7 +811,6 @@
=
} else {
ssize_t l;
- void *p;
int loop =3D 0;
=
l =3D u->out_fragment_size;
@@ -825,6 +830,7 @@
}
=
do {
+ void *p;
ssize_t t;
=
pa_assert(l > 0);
@@ -1019,9 +1025,10 @@
}
=
int pa__init(pa_core *c, pa_module*m) {
+ =
struct audio_buf_info info;
struct userdata *u =3D NULL;
- const char *p;
+ const char *dev;
int fd =3D -1;
int nfrags, frag_size;
int mode, caps;
@@ -1074,7 +1081,7 @@
goto fail;
}
=
- if ((fd =3D pa_oss_open(p =3D pa_modargs_get_value(ma, "device", DEFAU=
LT_DEVICE), &mode, &caps)) < 0)
+ if ((fd =3D pa_oss_open(dev =3D pa_modargs_get_value(ma, "device", DEF=
AULT_DEVICE), &mode, &caps)) < 0)
goto fail;
=
if (use_mmap && (!(caps & DSP_CAP_MMAP) || !(caps & DSP_CAP_TRIGGER)))=
{
@@ -1087,7 +1094,7 @@
use_mmap =3D 0;
}
=
- if (pa_oss_get_hw_description(p, hwdesc, sizeof(hwdesc)) >=3D 0)
+ if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >=3D 0)
pa_log_info("Hardware name is '%s'.", hwdesc);
else
hwdesc[0] =3D 0;
@@ -1111,11 +1118,12 @@
u->core =3D c;
u->module =3D m;
m->userdata =3D u;
+ u->fd =3D fd;
u->use_getospace =3D u->use_getispace =3D 1;
u->use_getodelay =3D 1;
u->use_input_volume =3D u->use_pcm_volume =3D 1;
u->mode =3D mode;
- u->device_name =3D pa_xstrdup(p);
+ u->device_name =3D pa_xstrdup(dev);
u->in_nfrags =3D u->out_nfrags =3D u->nfrags =3D nfrags;
u->out_fragment_size =3D u->in_fragment_size =3D u->frag_size =3D frag=
_size;
u->use_mmap =3D use_mmap;
@@ -1159,25 +1167,28 @@
if ((name =3D pa_modargs_get_value(ma, "source_name", NULL)))
namereg_fail =3D 1;
else {
- name =3D name_buf =3D pa_sprintf_malloc("oss_input.%s", pa_pat=
h_get_filename(p));
+ name =3D name_buf =3D pa_sprintf_malloc("oss_input.%s", pa_pat=
h_get_filename(dev));
namereg_fail =3D 0;
}
=
u->source =3D pa_source_new(c, __FILE__, name, namereg_fail, &ss, =
&map);
pa_xfree(name_buf);
- if (!u->source)
+ if (!u->source) {
+ pa_log("Failed to create source object");
goto fail;
+ }
=
u->source->parent.process_msg =3D source_process_msg;
u->source->userdata =3D u;
=
pa_source_set_module(u->source, m);
pa_source_set_asyncmsgq(u->source, u->asyncmsgq);
- pa_source_set_description(u->source, t =3D pa_sprintf_malloc("OSS =
PCM on %s%s%s%s",
- p,
- hwdesc[0]=
? " (" : "",
- hwdesc[0]=
? hwdesc : "",
- hwdesc[0]=
? ")" : ""));
+ pa_source_set_description(u->source, t =3D pa_sprintf_malloc(
+ "OSS PCM on %s%s%s%s",
+ dev,
+ hwdesc[0] ? " (" : "",
+ hwdesc[0] ? hwdesc : "",
+ hwdesc[0] ? ")" : ""));
pa_xfree(t);
u->source->is_hardware =3D 1;
u->source->refresh_volume =3D 1;
@@ -1210,25 +1221,28 @@
if ((name =3D pa_modargs_get_value(ma, "sink_name", NULL)))
namereg_fail =3D 1;
else {
- name =3D name_buf =3D pa_sprintf_malloc("oss_output.%s", pa_pa=
th_get_filename(p));
+ name =3D name_buf =3D pa_sprintf_malloc("oss_output.%s", pa_pa=
th_get_filename(dev));
namereg_fail =3D 0;
}
=
u->sink =3D pa_sink_new(c, __FILE__, name, namereg_fail, &ss, &map=
);
pa_xfree(name_buf);
- if (!u->sink)
+ if (!u->sink) {
+ pa_log("Failed to create sink object");
goto fail;
+ }
=
u->sink->parent.process_msg =3D sink_process_msg;
u->sink->userdata =3D u;
=
pa_sink_set_module(u->sink, m);
pa_sink_set_asyncmsgq(u->sink, u->asyncmsgq);
- pa_sink_set_description(u->sink, t =3D pa_sprintf_malloc("OSS PCM =
on %s%s%s%s",
- p,
- hwdesc[0] ? " (=
" : "",
- hwdesc[0] ? hwd=
esc : "",
- hwdesc[0] ? ")"=
: ""));
+ pa_sink_set_description(u->sink, t =3D pa_sprintf_malloc(
+ "OSS PCM on %s%s%s%s",
+ dev,
+ hwdesc[0] ? " (" : "",
+ hwdesc[0] ? hwdesc : "",
+ hwdesc[0] ? ")" : ""));
pa_xfree(t);
u->sink->is_hardware =3D 1;
u->sink->refresh_volume =3D 1;
@@ -1240,8 +1254,6 @@
go_on:
=
pa_assert(u->source || u->sink);
-
- u->fd =3D fd;
=
pa_memchunk_reset(&u->memchunk);
=
@@ -1261,7 +1273,10 @@
return 0;
=
fail:
- if (fd >=3D 0)
+
+ if (u)
+ pa__done(c, m);
+ else if (fd >=3D 0)
close(fd);
=
if (ma)
More information about the pulseaudio-commits
mailing list