#include <asoundlib.h>
+#include <polyp/xmalloc.h>
+
+#include <polypcore/core-error.h>
#include <polypcore/core.h>
#include <polypcore/module.h>
#include <polypcore/memchunk.h>
#include <polypcore/sink.h>
#include <polypcore/modargs.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/sample-util.h>
-#include <polypcore/xmalloc.h>
#include <polypcore/log.h>
#include "alsa-util.h"
PA_MODULE_AUTHOR("Lennart Poettering")
PA_MODULE_DESCRIPTION("ALSA Source")
PA_MODULE_VERSION(PACKAGE_VERSION)
-PA_MODULE_USAGE("source_name=<name for the source> device=<ALSA device> format=<sample format> channels=<number of channels> rate=<sample rate> fragments=<number of fragments> fragment_size=<fragment size>")
+PA_MODULE_USAGE(
+ "source_name=<name for the source> "
+ "device=<ALSA device> "
+ "format=<sample format> "
+ "channels=<number of channels> "
+ "rate=<sample rate> "
+ "fragments=<number of fragments> "
+ "fragment_size=<fragment size> "
+ "channel_map=<channel map>")
struct userdata {
snd_pcm_t *pcm_handle;
"format",
"fragments",
"fragment_size",
+ "channel_map",
NULL
};
u->memchunk.index = 0;
}
- assert(u->memchunk.memblock && u->memchunk.memblock->data && u->memchunk.length && u->memchunk.memblock->length && (u->memchunk.length % u->frame_size) == 0);
+ assert(u->memchunk.memblock);
+ assert(u->memchunk.length);
+ assert(u->memchunk.memblock->data);
+ assert(u->memchunk.memblock->length);
+ assert(u->memchunk.length % u->frame_size == 0);
if ((frames = snd_pcm_readi(u->pcm_handle, (uint8_t*) u->memchunk.memblock->data + u->memchunk.index, u->memchunk.length / u->frame_size)) < 0) {
if (frames == -EAGAIN)
continue;
}
- pa_log(__FILE__": snd_pcm_readi() failed: %s", strerror(-frames));
+ pa_log(__FILE__": snd_pcm_readi() failed: %s", pa_cstrerror(-frames));
return;
}
assert(u && u->mixer_handle);
+ if (mask == SND_CTL_EVENT_MASK_REMOVE)
+ return 0;
+
if (mask & SND_CTL_EVENT_MASK_VALUE) {
if (u->source->get_hw_volume)
u->source->get_hw_volume(u->source);
struct userdata *u = s->userdata;
long vol;
int err;
+ int i;
assert(u && u->mixer_elem);
- if (snd_mixer_selem_has_capture_volume_joined(u->mixer_elem)) {
- err = snd_mixer_selem_get_capture_volume(u->mixer_elem, 0, &vol);
+ for (i = 0;i < s->hw_volume.channels;i++) {
+ assert(snd_mixer_selem_has_capture_channel(u->mixer_elem, i));
+
+ err = snd_mixer_selem_get_capture_volume(u->mixer_elem, i, &vol);
if (err < 0)
goto fail;
- pa_cvolume_set(&s->hw_volume, s->hw_volume.channels,
- (vol - u->hw_volume_min) * PA_VOLUME_NORM / (u->hw_volume_max - u->hw_volume_min));
- } else {
- int i;
-
- for (i = 0;i < s->hw_volume.channels;i++) {
- err = snd_mixer_selem_get_capture_volume(u->mixer_elem, i, &vol);
- if (err < 0)
- goto fail;
- s->hw_volume.values[i] =
- (vol - u->hw_volume_min) * PA_VOLUME_NORM / (u->hw_volume_max - u->hw_volume_min);
- }
+ s->hw_volume.values[i] =
+ (vol - u->hw_volume_min) * PA_VOLUME_NORM / (u->hw_volume_max - u->hw_volume_min);
}
return 0;
struct userdata *u = s->userdata;
int err;
pa_volume_t vol;
+ int i;
assert(u && u->mixer_elem);
- if (snd_mixer_selem_has_capture_volume_joined(u->mixer_elem)) {
- vol = pa_cvolume_avg(&s->hw_volume) * (u->hw_volume_max - u->hw_volume_min) /
+ for (i = 0;i < s->hw_volume.channels;i++) {
+ assert(snd_mixer_selem_has_capture_channel(u->mixer_elem, i));
+
+ vol = s->hw_volume.values[i];
+
+ if (vol > PA_VOLUME_NORM)
+ vol = PA_VOLUME_NORM;
+
+ vol = vol * (u->hw_volume_max - u->hw_volume_min) /
PA_VOLUME_NORM + u->hw_volume_min;
- err = snd_mixer_selem_set_capture_volume_all(u->mixer_elem, vol);
+ err = snd_mixer_selem_set_capture_volume(u->mixer_elem, i, vol);
if (err < 0)
goto fail;
- } else {
- int i;
-
- for (i = 0;i < s->hw_volume.channels;i++) {
- vol = s->hw_volume.values[i] * (u->hw_volume_max - u->hw_volume_min) /
- PA_VOLUME_NORM + u->hw_volume_min;
- err = snd_mixer_selem_set_capture_volume(u->mixer_elem, i, vol);
- if (err < 0)
- goto fail;
- }
}
return 0;
struct userdata *u = NULL;
const char *dev;
pa_sample_spec ss;
+ pa_channel_map map;
unsigned periods, fragsize;
snd_pcm_uframes_t period_size;
size_t frame_size;
+ snd_pcm_info_t *pcm_info = NULL;
int err;
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
}
ss = c->default_sample_spec;
- if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
+ if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_ALSA) < 0) {
pa_log(__FILE__": failed to parse sample specification");
goto fail;
}
+
frame_size = pa_frame_size(&ss);
-
+
+ /* Fix latency to 100ms */
periods = 12;
- fragsize = 1024;
+ fragsize = pa_bytes_per_second(&ss)/128;
+
if (pa_modargs_get_value_u32(ma, "fragments", &periods) < 0 || pa_modargs_get_value_u32(ma, "fragment_size", &fragsize) < 0) {
pa_log(__FILE__": failed to parse buffer metrics");
goto fail;
}
- period_size = fragsize;
+ period_size = fragsize/frame_size;
u = pa_xmalloc0(sizeof(struct userdata));
m->userdata = u;
goto fail;
}
+ if ((err = snd_pcm_info_malloc(&pcm_info)) < 0 ||
+ (err = snd_pcm_info(u->pcm_handle, pcm_info)) < 0) {
+ pa_log(__FILE__": Error fetching PCM info: %s", snd_strerror(err));
+ goto fail;
+ }
+
if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &periods, &period_size)) < 0) {
pa_log(__FILE__": Failed to set hardware parameters: %s", snd_strerror(err));
goto fail;
u->mixer_handle = NULL;
}
- u->source = pa_source_new(c, __FILE__, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, NULL);
+ u->source = pa_source_new(c, __FILE__, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, &map);
assert(u->source);
u->source->userdata = u;
if (u->mixer_handle) {
assert(u->mixer_elem);
if (snd_mixer_selem_has_capture_volume(u->mixer_elem)) {
- u->source->get_hw_volume = source_get_hw_volume_cb;
- u->source->set_hw_volume = source_set_hw_volume_cb;
- snd_mixer_selem_get_capture_volume_range(
- u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max);
+ int i;
+
+ for (i = 0;i < ss.channels;i++) {
+ if (!snd_mixer_selem_has_capture_channel(u->mixer_elem, i))
+ break;
+ }
+
+ if (i == ss.channels) {
+ u->source->get_hw_volume = source_get_hw_volume_cb;
+ u->source->set_hw_volume = source_set_hw_volume_cb;
+ snd_mixer_selem_get_capture_volume_range(
+ u->mixer_elem, &u->hw_volume_min, &u->hw_volume_max);
+ }
}
if (snd_mixer_selem_has_capture_switch(u->mixer_elem)) {
u->source->get_hw_mute = source_get_hw_mute_cb;
}
}
pa_source_set_owner(u->source, m);
- u->source->description = pa_sprintf_malloc("Advanced Linux Sound Architecture PCM on '%s'", dev);
+ u->source->description = pa_sprintf_malloc("Advanced Linux Sound Architecture PCM on '%s' (%s)", dev, snd_pcm_info_get_name(pcm_info));
u->pcm_fdl = pa_alsa_fdlist_new();
assert(u->pcm_fdl);
}
u->frame_size = frame_size;
- u->fragment_size = period_size;
+ u->fragment_size = period_size * frame_size;
- pa_log(__FILE__": using %u fragments of size %u bytes.", periods, u->fragment_size);
+ pa_log_info(__FILE__": using %u fragments of size %lu bytes.", periods, (long unsigned) u->fragment_size);
u->memchunk.memblock = NULL;
u->memchunk.index = u->memchunk.length = 0;
finish:
if (ma)
pa_modargs_free(ma);
+
+ if (pcm_info)
+ snd_pcm_info_free(pcm_info);
return ret;