Abramo Bagnara <abramo@alsa-project.org>

Sat, 11 Dec 1999 08:45:24 +0100
- changed lowlevel drivers to use pcm_misc.c functions
- fixed some bugs in pcm_plugin_build
- the plugin code is shared between alsa-lib and alsa-driver
This commit is contained in:
Jaroslav Kysela 1999-12-11 11:46:05 +00:00
parent 0f0ce09509
commit 20ebae20a7
13 changed files with 596 additions and 508 deletions

View file

@ -162,65 +162,6 @@ snd_pcm_plugin_t *snd_pcm_plugin_last(snd_pcm_t *pcm, int channel)
return pcm->plugin_last[channel];
}
ssize_t snd_pcm_plugin_transfer_size(snd_pcm_t *pcm, int channel, size_t drv_size)
{
snd_pcm_plugin_t *plugin, *plugin_prev, *plugin_next;
if (!pcm || channel < 0 || channel > 1)
return -EINVAL;
if (drv_size == 0)
return 0;
if (drv_size < 0)
return -EINVAL;
if (channel == SND_PCM_CHANNEL_PLAYBACK) {
plugin = snd_pcm_plugin_last(pcm, channel);
while (plugin) {
plugin_prev = plugin->prev;
if (plugin->src_size)
drv_size = plugin->src_size(plugin, drv_size);
plugin = plugin_prev;
}
} else if (channel == SND_PCM_CHANNEL_CAPTURE) {
plugin = snd_pcm_plugin_first(pcm, channel);
while (plugin) {
plugin_next = plugin->next;
if (plugin->dst_size)
drv_size = plugin->dst_size(plugin, drv_size);
plugin = plugin_next;
}
}
return drv_size;
}
ssize_t snd_pcm_plugin_hardware_size(snd_pcm_t *pcm, int channel, size_t trf_size)
{
snd_pcm_plugin_t *plugin, *plugin_prev, *plugin_next;
if (!pcm || channel < 0 || channel > 1)
return -EINVAL;
if (trf_size == 0)
return 0;
if (trf_size < 0)
return -EINVAL;
if (channel == SND_PCM_CHANNEL_PLAYBACK) {
plugin = snd_pcm_plugin_first(pcm, channel);
while (plugin) {
plugin_next = plugin->next;
if (plugin->dst_size)
trf_size = plugin->dst_size(plugin, trf_size);
plugin = plugin_next;
}
} else if (channel == SND_PCM_CHANNEL_CAPTURE) {
plugin = snd_pcm_plugin_last(pcm, channel);
while (plugin) {
plugin_prev = plugin->prev;
if (plugin->src_size)
trf_size = plugin->src_size(plugin, trf_size);
plugin = plugin_prev;
}
}
return trf_size;
}
double snd_pcm_plugin_transfer_ratio(snd_pcm_t *pcm, int channel)
{
@ -246,23 +187,13 @@ double snd_pcm_plugin_hardware_ratio(snd_pcm_t *pcm, int channel)
*
*/
static unsigned int snd_pcm_plugin_formats(snd_pcm_t *pcm, unsigned int formats)
{
formats |= SND_PCM_FMT_MU_LAW | SND_PCM_FMT_A_LAW | SND_PCM_FMT_IMA_ADPCM;
if (formats & (SND_PCM_FMT_U8|SND_PCM_FMT_S8|
SND_PCM_FMT_U16_LE|SND_PCM_FMT_S16_LE))
formats |= SND_PCM_FMT_U8|SND_PCM_FMT_S8|
SND_PCM_FMT_U16_LE|SND_PCM_FMT_S16_LE;
return formats;
}
int snd_pcm_plugin_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *info)
{
int err;
if ((err = snd_pcm_channel_info(pcm, info)) < 0)
return err;
info->formats = snd_pcm_plugin_formats(pcm, info->formats);
info->formats = snd_pcm_plugin_formats(info->formats);
info->min_rate = 4000;
info->max_rate = 192000;
info->rates = SND_PCM_RATE_8000_48000;
@ -285,28 +216,16 @@ static int snd_pcm_plugin_action(snd_pcm_t *pcm, int channel, int action)
return 0;
}
#if 0
#define PLUGIN_DEBUG
#define pdprintf( args... ) printf( "plugin: " ##args)
#else
#define pdprintf( args... ) { ; }
#endif
int snd_pcm_plugin_params(snd_pcm_t *pcm, snd_pcm_channel_params_t *params)
{
snd_pcm_channel_params_t hwparams;
snd_pcm_channel_params_t srcparams, tmpparams;
snd_pcm_channel_params_t *dstparams;
snd_pcm_channel_info_t hwinfo;
snd_pcm_plugin_t *plugin;
int err;
if (!pcm || !params || params->channel < 0 || params->channel > 1)
return -EINVAL;
memcpy(&hwparams, params, sizeof(hwparams));
pdprintf("params begin\n");
/*
* try to decide, if a conversion is required
*/
@ -317,302 +236,16 @@ int snd_pcm_plugin_params(snd_pcm_t *pcm, snd_pcm_channel_params_t *params)
snd_pcm_plugin_clear(pcm, params->channel);
return err;
}
if ((hwinfo.formats & (1 << params->format.format)) == 0) {
if ((snd_pcm_plugin_formats(pcm, hwinfo.formats) & (1 << params->format.format)) == 0)
return -EINVAL;
switch (params->format.format) {
case SND_PCM_SFMT_U8:
if (hwinfo.formats & SND_PCM_FMT_S8) {
hwparams.format.format = SND_PCM_SFMT_S8;
} else if (hwinfo.formats & SND_PCM_FMT_U16_LE) {
hwparams.format.format = SND_PCM_SFMT_U16_LE;
} else if (hwinfo.formats & SND_PCM_FMT_S16_LE) {
hwparams.format.format = SND_PCM_SFMT_S16_LE;
} else {
return -EINVAL;
}
break;
case SND_PCM_SFMT_S8:
if (hwinfo.formats & SND_PCM_FMT_U8) {
hwparams.format.format = SND_PCM_SFMT_U8;
} else if (hwinfo.formats & SND_PCM_FMT_S16_LE) {
hwparams.format.format = SND_PCM_SFMT_S16_LE;
} else if (hwinfo.formats & SND_PCM_FMT_U16_LE) {
hwparams.format.format = SND_PCM_SFMT_U16_LE;
} else {
return -EINVAL;
}
break;
case SND_PCM_SFMT_S16_LE:
if (hwinfo.formats & SND_PCM_FMT_U16_LE) {
hwparams.format.format = SND_PCM_SFMT_U16_LE;
} else if (hwinfo.formats & SND_PCM_FMT_S8) {
hwparams.format.format = SND_PCM_SFMT_S8;
} else if (hwinfo.formats & SND_PCM_FMT_U8) {
hwparams.format.format = SND_PCM_SFMT_U8;
} else {
return -EINVAL;
}
break;
case SND_PCM_SFMT_U16_LE:
if (hwinfo.formats & SND_PCM_FMT_S16_LE) {
hwparams.format.format = SND_PCM_SFMT_S16_LE;
} else if (hwinfo.formats & SND_PCM_FMT_U8) {
hwparams.format.format = SND_PCM_SFMT_U8;
} else if (hwinfo.formats & SND_PCM_FMT_S8) {
hwparams.format.format = SND_PCM_SFMT_S8;
} else {
return -EINVAL;
}
break;
case SND_PCM_SFMT_MU_LAW:
if (hwinfo.formats & SND_PCM_FMT_S16_LE) {
hwparams.format.format = SND_PCM_SFMT_S16_LE;
} else if (hwinfo.formats & SND_PCM_FMT_U16_LE) {
hwparams.format.format = SND_PCM_SFMT_U16_LE;
} else if (hwinfo.formats & SND_PCM_FMT_S8) {
hwparams.format.format = SND_PCM_SFMT_S8;
} else if (hwinfo.formats & SND_PCM_FMT_U8) {
hwparams.format.format = SND_PCM_SFMT_U8;
} else {
return -EINVAL;
}
break;
case SND_PCM_SFMT_A_LAW:
if (hwinfo.formats & SND_PCM_FMT_S16_LE) {
hwparams.format.format = SND_PCM_SFMT_S16_LE;
} else if (hwinfo.formats & SND_PCM_FMT_U16_LE) {
hwparams.format.format = SND_PCM_SFMT_U16_LE;
} else if (hwinfo.formats & SND_PCM_FMT_S8) {
hwparams.format.format = SND_PCM_SFMT_S8;
} else if (hwinfo.formats & SND_PCM_FMT_U8) {
hwparams.format.format = SND_PCM_SFMT_U8;
} else {
return -EINVAL;
}
case SND_PCM_SFMT_IMA_ADPCM:
if (hwinfo.formats & SND_PCM_FMT_S16_LE) {
hwparams.format.format = SND_PCM_SFMT_S16_LE;
} else if (hwinfo.formats & SND_PCM_FMT_U16_LE) {
hwparams.format.format = SND_PCM_SFMT_U16_LE;
} else if (hwinfo.formats & SND_PCM_FMT_S8) {
hwparams.format.format = SND_PCM_SFMT_S8;
} else if (hwinfo.formats & SND_PCM_FMT_U8) {
hwparams.format.format = SND_PCM_SFMT_U8;
} else {
return -EINVAL;
}
break;
default:
return -EINVAL;
}
}
/* voices */
if (params->format.voices < hwinfo.min_voices ||
params->format.voices > hwinfo.max_voices) {
int dst_voices = params->format.voices < hwinfo.min_voices ?
hwinfo.min_voices : hwinfo.max_voices;
if ((params->format.rate < hwinfo.min_rate ||
params->format.rate > hwinfo.max_rate) &&
dst_voices > 2)
dst_voices = 2;
hwparams.format.voices = dst_voices;
pdprintf("params voice correction: dst_voices=%i\n", dst_voices);
}
if ((err = snd_pcm_plugin_hwparams(params, &hwinfo, &hwparams)) < 0)
return err;
/* rate */
if (params->format.rate < hwinfo.min_rate ||
params->format.rate > hwinfo.max_rate) {
int dst_rate = params->format.rate < hwinfo.min_rate ?
hwinfo.min_rate : hwinfo.max_rate;
hwparams.format.rate = dst_rate;
pdprintf("params rate correction: dst_rate=%i\n", dst_rate);
}
/* interleave */
hwparams.format.interleave = params->format.interleave;
if (!(hwinfo.flags & SND_PCM_CHNINFO_INTERLEAVE))
hwparams.format.interleave = 0;
if (!(hwinfo.flags & SND_PCM_CHNINFO_NONINTERLEAVE))
hwparams.format.interleave = 1;
/*
* add necessary plugins
*/
snd_pcm_plugin_clear(pcm, params->channel);
if (params->channel == SND_PCM_CHANNEL_PLAYBACK) {
memcpy(&srcparams, params, sizeof(srcparams));
memcpy(&tmpparams, params, sizeof(tmpparams));
dstparams = &hwparams;
} else {
memcpy(&srcparams, &hwparams, sizeof(srcparams));
memcpy(&tmpparams, &hwparams, sizeof(tmpparams));
dstparams = params;
}
/* Convert to interleaved format if needed */
if (!srcparams.format.interleave &&
(srcparams.format.voices != dstparams->format.voices ||
(srcparams.format.rate != dstparams->format.rate &&
srcparams.format.voices > 1))) {
tmpparams.format.interleave = 1;
pdprintf("params interleave plugin: src=%i, dst=%i\n", srcparams.format.interleave, tmpparams.format.interleave);
err = snd_pcm_plugin_build_interleave(&srcparams.format,
&tmpparams.format,
&plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
err = snd_pcm_plugin_append(pcm, params->channel, plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
srcparams.format.interleave = 1;
/* Avoid useless interleave revert */
if (params->channel == SND_PCM_CHANNEL_PLAYBACK &&
(hwinfo.flags & SND_PCM_CHNINFO_INTERLEAVE))
dstparams->format.interleave = 1;
}
/* voices reduction */
if (srcparams.format.voices > dstparams->format.voices) {
tmpparams.format.voices = dstparams->format.voices;
pdprintf("params voices reduction: src=%i, dst=%i\n", srcparams.format.voices, tmpparams.format.voices);
err = snd_pcm_plugin_build_voices(&srcparams.format,
&tmpparams.format,
&plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
err = snd_pcm_plugin_append(pcm, params->channel, plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
srcparams.format.voices = dstparams->format.voices;
}
/* rate resampling (when the source format has a highter resolution) */
if (srcparams.format.format > dstparams->format.format &&
srcparams.format.format <= SND_PCM_SFMT_FLOAT64_BE &&
srcparams.format.rate != dstparams->format.rate) {
tmpparams.format.rate = dstparams->format.rate;
pdprintf("params rate resampling (1): src=%i, dst=%i\n", srcparams.format.rate, tmpparams.format.rate);
err = snd_pcm_plugin_build_rate(&srcparams.format,
&tmpparams.format,
&plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
err = snd_pcm_plugin_append(pcm, params->channel, plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
srcparams.format.rate = dstparams->format.rate;
}
/* format change */
if (srcparams.format.format != dstparams->format.format) {
tmpparams.format.format = dstparams->format.format;
pdprintf("params format change: src=%i, dst=%i\n", srcparams.format.format, tmpparams.format.format);
switch (params->format.format) {
case SND_PCM_SFMT_MU_LAW:
err = snd_pcm_plugin_build_mulaw(&srcparams.format,
&tmpparams.format,
&plugin);
break;
case SND_PCM_SFMT_A_LAW:
err = snd_pcm_plugin_build_alaw(&srcparams.format,
&tmpparams.format,
&plugin);
break;
case SND_PCM_SFMT_IMA_ADPCM:
err = snd_pcm_plugin_build_adpcm(&srcparams.format,
&tmpparams.format,
&plugin);
break;
default:
err = snd_pcm_plugin_build_linear(&srcparams.format,
&tmpparams.format,
&plugin);
}
if (err < 0)
return err;
err = snd_pcm_plugin_append(pcm, params->channel, plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
srcparams.format.format = dstparams->format.format;
}
/* rate resampling (when the destonation format has an equal or highter resolution) */
if (srcparams.format.format <= dstparams->format.format &&
srcparams.format.rate != dstparams->format.rate) {
tmpparams.format.rate = dstparams->format.rate;
pdprintf("params rate resampling (2): src=%i, dst=%i\n", srcparams.format.rate, tmpparams.format.rate);
err = snd_pcm_plugin_build_rate(&srcparams.format,
&tmpparams.format,
&plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
err = snd_pcm_plugin_append(pcm, params->channel, plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
srcparams.format.rate = dstparams->format.rate;
}
/* voices extension */
if (srcparams.format.voices < dstparams->format.voices) {
tmpparams.format.voices = dstparams->format.voices;
pdprintf("params voices extension: src=%i, dst=%i\n", srcparams.format.voices, tmpparams.format.voices);
err = snd_pcm_plugin_build_voices(&srcparams.format,
&tmpparams.format,
&plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
err = snd_pcm_plugin_append(pcm, params->channel, plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
srcparams.format.voices = dstparams->format.voices;
}
/* interleave change */
if (params->format.voices > 1 &&
hwinfo.mode == SND_PCM_MODE_BLOCK &&
srcparams.format.interleave != dstparams->format.interleave) {
tmpparams.format.interleave = dstparams->format.interleave;
pdprintf("params interleave change: src=%i, dst=%i\n", srcparams.format.interleave, tmpparams.format.interleave);
err = snd_pcm_plugin_build_interleave(&srcparams.format,
&tmpparams.format,
&plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
err = snd_pcm_plugin_append(pcm, params->channel, plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
srcparams.format.interleave = dstparams->format.interleave;
}
/* add necessary plugins */
if ((err = snd_pcm_plugin_format(pcm, params, &hwparams, &hwinfo)) < 0)
return err;
/*
* I/O plugins