mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Implemented voice_setup. Changed mmap control

Browse source
This commit is contained in:
Abramo Bagnara 2000-04-16 15:36:30 +00:00
parent fe03a4781b
commit cab3f4819b
1 changed files with 90 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

213
src/pcm/plugin/mmap.c
View file

@ -37,12 +37,12 @@ typedef struct mmap_private_data {
snd_pcm_mmap_control_t *control; snd_pcm_mmap_control_t *control;
char *buffer; char *buffer;
int frag; int frag;
int frag_size, samples_frag_size;
int start_mode, stop_mode; int start_mode, stop_mode;
int frags, frags_used; int frags, frags_used;
int frags_min, frags_max; int frags_min, frags_max;
unsigned int lastblock; unsigned int lastblock;
struct iovec *vector; snd_pcm_plugin_voice_t voices[0];
int vector_count;
} mmap_t; } mmap_t;
static int playback_ok(snd_pcm_plugin_t *plugin) static int playback_ok(snd_pcm_plugin_t *plugin)
@ -189,48 +189,31 @@ static int mmap_src_voices(snd_pcm_plugin_t *plugin,
void *(*plugin_alloc)(snd_pcm_plugin_handle_t *handle, size_t size)) void *(*plugin_alloc)(snd_pcm_plugin_handle_t *handle, size_t size))
{ {
mmap_t *data; mmap_t *data;
snd_pcm_mmap_control_t *control;
snd_pcm_plugin_voice_t *v;
int err; int err;
int voice;
snd_pcm_plugin_voice_t *dv, *sv;
if (plugin == NULL || voices == NULL) if (plugin == NULL || voices == NULL)
return -EINVAL; return -EINVAL;
*voices = NULL;
data = (mmap_t *)plugin->extra_data; data = (mmap_t *)plugin->extra_data;
if (data->channel != SND_PCM_CHANNEL_PLAYBACK) if (data->channel != SND_PCM_CHANNEL_PLAYBACK)
return -EINVAL; return -EINVAL;
if ((control = data->control) == NULL) if (snd_pcm_plugin_dst_samples_to_size(plugin, samples) != data->frag_size)
return -EBADFD; return -EINVAL;
/* wait until the block is not free */ /* wait until the block is not free */
while (!playback_ok(plugin)) { while (!playback_ok(plugin)) {
err = query_playback(plugin, 0); err = query_playback(plugin, 0);
if (err < 0) if (err < 0)
return err; return err;
} }
v = plugin->voices; sv = data->voices;
if (plugin->src_format.interleave) { dv = plugin->voices;
void *addr; for (voice = 0; voice < plugin->src_format.voices; ++voice) {
int voice; dv->addr = sv->addr + (sv->step * data->samples_frag_size * data->frag) / 8;
if (control->status.frag_size != snd_pcm_plugin_dst_samples_to_size(plugin, samples)) dv->first = sv->first;
return -EINVAL; dv->step = sv->step;
addr = data->buffer + control->fragments[data->frag].addr; ++sv;
for (voice = 0; voice < plugin->src_format.voices; voice++, v++) { ++dv;
v->aptr = NULL;
v->addr = addr;
v->offset = voice * plugin->src_width;
v->next = plugin->src_format.voices * plugin->src_width;
}
} else {
int frag, voice;
if (control->status.frag_size != snd_pcm_plugin_src_samples_to_size(plugin, samples) / plugin->src_format.voices)
return -EINVAL;
for (voice = 0; voice < plugin->src_format.voices; voice++, v++) {
frag = data->frag + (voice * data->frags);
v->aptr = NULL;
v->addr = data->buffer + control->fragments[frag].addr;
v->offset = 0;
v->next = plugin->src_width;
}
} }
*voices = plugin->voices; *voices = plugin->voices;
return 0; return 0;
@ -242,39 +225,24 @@ static int mmap_dst_voices(snd_pcm_plugin_t *plugin,
void *(*plugin_alloc)(snd_pcm_plugin_handle_t *handle, size_t size)) void *(*plugin_alloc)(snd_pcm_plugin_handle_t *handle, size_t size))
{ {
mmap_t *data; mmap_t *data;
snd_pcm_mmap_control_t *control; int voice;
snd_pcm_plugin_voice_t *v; snd_pcm_plugin_voice_t *dv, *sv;
if (plugin == NULL || voices == NULL) if (plugin == NULL || voices == NULL)
return -EINVAL; return -EINVAL;
*voices = NULL;
data = (mmap_t *)plugin->extra_data; data = (mmap_t *)plugin->extra_data;
if (data->channel != SND_PCM_CHANNEL_CAPTURE) if (data->channel != SND_PCM_CHANNEL_CAPTURE)
return -EINVAL; return -EINVAL;
if ((control = data->control) == NULL) if (snd_pcm_plugin_src_samples_to_size(plugin, samples) != data->frag_size)
return -EBADFD; return -EINVAL;
v = plugin->voices; sv = data->voices;
if (plugin->dst_format.interleave) { dv = plugin->voices;
void *addr; for (voice = 0; voice < plugin->src_format.voices; ++voice) {
int voice; dv->addr = sv->addr + (sv->step * data->samples_frag_size * data->frag) / 8;
if (control->status.frag_size != snd_pcm_plugin_dst_samples_to_size(plugin, samples)) dv->first = sv->first;
return -EINVAL; dv->step = sv->step;
addr = data->buffer + control->fragments[data->frag].addr; ++sv;
for (voice = 0; voice < plugin->dst_format.voices; voice++, v++) { ++dv;
v->addr = addr;
v->offset = voice * plugin->src_width;
v->next = plugin->dst_format.voices * plugin->dst_width;
}
} else {
int frag, voice;
if (control->status.frag_size != snd_pcm_plugin_dst_samples_to_size(plugin, samples) / plugin->dst_format.voices)
return -EINVAL;
for (voice = 0; voice < plugin->dst_format.voices; voice++, v++) {
frag = data->frag + (voice * data->frags);
v->addr = data->buffer + control->fragments[frag].addr;
v->offset = 0;
v->next = plugin->dst_width;
}
} }
*voices = plugin->voices; *voices = plugin->voices;
return 0; return 0;
@ -288,8 +256,7 @@ static ssize_t mmap_transfer(snd_pcm_plugin_t *plugin,
mmap_t *data; mmap_t *data;
snd_pcm_mmap_control_t *control; snd_pcm_mmap_control_t *control;
ssize_t size; ssize_t size;
int voice, err; int err;
char *addr;
if (plugin == NULL) if (plugin == NULL)
return -EINVAL; return -EINVAL;
@ -306,40 +273,28 @@ static ssize_t mmap_transfer(snd_pcm_plugin_t *plugin,
return err; return err;
} }
size = snd_pcm_plugin_src_samples_to_size(plugin, samples); size = snd_pcm_plugin_src_samples_to_size(plugin, samples);
if (size < 0) if (size != data->frag_size)
return size; return -EINVAL;
if (plugin->src_format.interleave) { if (src_voices != data->voices) {
if (size != control->status.frag_size) if (plugin->src_format.interleave) {
return -EINVAL; void *dst = data->voices[0].addr + data->frag * data->frag_size;
addr = data->buffer + control->fragments[data->frag].addr; /* Paranoia: add check for src_voices */
if (src_voices->addr != addr) memcpy(dst, src_voices[0].addr, size);
memcpy(addr, src_voices->addr, size); } else {
control->fragments[data->frag++].data = 1; int voice;
data->frag %= control->status.frags; size /= plugin->src_format.voices;
data->frags_used++; for (voice = 0; voice < plugin->src_format.voices; ++voice) {
return samples; void *dst = data->voices[voice].addr + (data->voices[voice].step * data->samples_frag_size * data->frag) / 8;
} else { /* Paranoia: add check for src_voices */
int frag; memcpy(dst, src_voices[voice].addr, size);
if ((size / plugin->src_format.voices) != control->status.frag_size)
return -EINVAL;
for (voice = 0; voice < plugin->src_format.voices; voice++) {
frag = data->frag + (voice * data->frags);
while (control->fragments[frag].data) {
err = query_playback(plugin, 1);
if (err < 0)
return err;
} }
addr = data->buffer + control->fragments[frag].addr;
if (src_voices[voice].addr != addr)
memcpy(addr, src_voices[voice].addr, control->status.frag_size);
control->fragments[frag].data = 1;
} }
data->frag++;
data->frag %= data->frags;
data->frags_used++;
return samples;
} }
control->fragments[data->frag].data = 1;
data->frag++;
data->frag %= data->frags;
data->frags_used++;
return samples;
} else if (data->channel == SND_PCM_CHANNEL_CAPTURE) { } else if (data->channel == SND_PCM_CHANNEL_CAPTURE) {
if (dst_voices == NULL) if (dst_voices == NULL)
return -EINVAL; return -EINVAL;
@ -349,40 +304,33 @@ static ssize_t mmap_transfer(snd_pcm_plugin_t *plugin,
return err; return err;
} }
size = snd_pcm_plugin_dst_samples_to_size(plugin, samples); size = snd_pcm_plugin_dst_samples_to_size(plugin, samples);
if (size < 0) if (size != data->frag_size)
return size; return -EINVAL;
if (plugin->dst_format.interleave) { if (dst_voices != data->voices) {
if (size != control->status.frag_size) if (plugin->dst_format.interleave) {
return -EINVAL; void *src = data->voices[0].addr + data->frag * data->frag_size;
addr = data->buffer + control->fragments[data->frag].addr; /* Paranoia: add check for dst_voices */
if (dst_voices->addr != addr) memcpy(dst_voices[0].addr, src, size);
memcpy(dst_voices->addr, addr, size); } else {
control->fragments[data->frag++].data = 0; int voice;
data->frag %= control->status.frags; size /= plugin->src_format.voices;
data->frags_used--; for (voice = 0; voice < plugin->src_format.voices; ++voice) {
return samples; void *src = data->voices[voice].addr + (data->voices[voice].step * data->samples_frag_size * data->frag) / 8;
} else { /* Paranoia: add check for dst_voices */
int frag; memcpy(dst_voices[voice].addr, src, size);
if ((size / plugin->dst_format.voices) != control->status.frag_size)
return -EINVAL;
for (voice = 0; voice < plugin->dst_format.voices; voice++) {
frag = data->frag + (voice * data->frags);
while (!control->fragments[data->frag].data) {
err = query_capture(plugin, 1);
if (err < 0)
return err;
} }
addr = data->buffer + control->fragments[frag].addr;
if (dst_voices[voice].addr != addr)
memcpy(dst_voices[voice].addr, addr, control->status.frag_size);
control->fragments[frag].data = 0;
} }
data->frag++; control->fragments[data->frag].data = 0;
data->frag %= data->frags; } else {
data->frags_used--; int prev_frag = data->frag - 1;
return samples; if (prev_frag < 0)
prev_frag = data->frags - 1;
control->fragments[prev_frag].data = 0;
} }
data->frag++;
data->frag %= data->frags;
data->frags_used--;
return samples;
} else { } else {
return -EINVAL; return -EINVAL;
} }
@ -401,6 +349,8 @@ static int mmap_action(snd_pcm_plugin_t *plugin,
snd_pcm_channel_params_t *params; snd_pcm_channel_params_t *params;
snd_pcm_channel_setup_t setup; snd_pcm_channel_setup_t setup;
int result; int result;
int voice;
snd_pcm_plugin_voice_t *v;
if (data->control) if (data->control)
snd_pcm_munmap(plugin->handle, data->channel); snd_pcm_munmap(plugin->handle, data->channel);
@ -415,6 +365,8 @@ static int mmap_action(snd_pcm_plugin_t *plugin,
if ((result = snd_pcm_channel_setup(plugin->handle, &setup)) < 0) if ((result = snd_pcm_channel_setup(plugin->handle, &setup)) < 0)
return result; return result;
data->frags = setup.buf.block.frags; data->frags = setup.buf.block.frags;
data->frag_size = setup.buf.block.frag_size;
data->samples_frag_size = data->frag_size / snd_pcm_format_size(plugin->src_format.format, plugin->src_format.voices);
data->frags_min = setup.buf.block.frags_min; data->frags_min = setup.buf.block.frags_min;
data->frags_max = setup.buf.block.frags_max; data->frags_max = setup.buf.block.frags_max;
if (data->frags_min < 0) if (data->frags_min < 0)
@ -429,6 +381,21 @@ static int mmap_action(snd_pcm_plugin_t *plugin,
data->frags_max = 1; data->frags_max = 1;
if (data->frags_max > setup.buf.block.frags) if (data->frags_max > setup.buf.block.frags)
data->frags_max = setup.buf.block.frags; data->frags_max = setup.buf.block.frags;
v = data->voices;
for (voice = 0; voice < plugin->src_format.voices; ++voice) {
snd_pcm_voice_setup_t vsetup;
vsetup.voice = voice;
if ((result = snd_pcm_voice_setup(plugin->handle, data->channel, &vsetup)) < 0)
return result;
if (vsetup.addr < 0)
return -EBADFD;
v->addr = data->buffer + vsetup.addr;
v->first = vsetup.first;
v->step = vsetup.step;
v++;
}
return 0; return 0;
} else if (action == PREPARE) { } else if (action == PREPARE) {
data->frag = 0; data->frag = 0;
@ -471,7 +438,7 @@ int snd_pcm_plugin_build_mmap(snd_pcm_t *pcm, int channel,
"I/O mmap playback" : "I/O mmap playback" :
"I/O mmap capture", "I/O mmap capture",
format, format, format, format,
sizeof(mmap_t)); sizeof(mmap_t) + sizeof(snd_pcm_plugin_voice_t) * format->voices);
if (plugin == NULL) if (plugin == NULL)
return -ENOMEM; return -ENOMEM;
data = (mmap_t *)plugin->extra_data; data = (mmap_t *)plugin->extra_data;