mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Abramo Bagnara <abramo@alsa-project.org>

Browse source 
- cleaned oss capture
- fixed conversion plugin insertion
card share:
- fixed bugs in group control
- give to OSS mixer a chance to control as more elements as possible
This commit is contained in:
Jaroslav Kysela 1999-12-12 17:23:44 +00:00
parent 76d4466882
commit b563621421
3 changed files with 131 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/pcm/pcm_local.h
View file

@ -47,8 +47,7 @@ int snd_pcm_plugin_hwparams(snd_pcm_channel_params_t *params,
int snd_pcm_plugin_format(snd_pcm_t *pcm, int snd_pcm_plugin_format(snd_pcm_t *pcm,
snd_pcm_channel_params_t *params, snd_pcm_channel_params_t *params,
snd_pcm_channel_params_t *hwparams, snd_pcm_channel_params_t *hwparams,
snd_pcm_channel_info_t *hwinfo, snd_pcm_channel_info_t *hwinfo);
snd_pcm_channel_params_t *newparams);
#if 0 #if 0
#define PLUGIN_DEBUG #define PLUGIN_DEBUG

25
src/pcm/pcm_plugin.c
View file

@ -218,7 +218,7 @@ static int snd_pcm_plugin_action(snd_pcm_t *pcm, int channel, int action)
int snd_pcm_plugin_params(snd_pcm_t *pcm, snd_pcm_channel_params_t *params) int snd_pcm_plugin_params(snd_pcm_t *pcm, snd_pcm_channel_params_t *params)
{ {
snd_pcm_channel_params_t hwparams, newparams; snd_pcm_channel_params_t hwparams, params1;
snd_pcm_channel_info_t hwinfo; snd_pcm_channel_info_t hwinfo;
snd_pcm_plugin_t *plugin; snd_pcm_plugin_t *plugin;
int err; int err;
@ -244,7 +244,8 @@ int snd_pcm_plugin_params(snd_pcm_t *pcm, snd_pcm_channel_params_t *params)
snd_pcm_plugin_clear(pcm, params->channel); snd_pcm_plugin_clear(pcm, params->channel);
/* add necessary plugins */ /* add necessary plugins */
if ((err = snd_pcm_plugin_format(pcm, params, &hwparams, &hwinfo, &newparams)) < 0) memcpy(&params1, params, sizeof(*params));
if ((err = snd_pcm_plugin_format(pcm, &params1, &hwparams, &hwinfo)) < 0)
return err; return err;
/* /*
@ -279,22 +280,22 @@ int snd_pcm_plugin_params(snd_pcm_t *pcm, snd_pcm_channel_params_t *params)
/* compute right sizes */ /* compute right sizes */
if (params->mode == SND_PCM_MODE_STREAM) { if (params->mode == SND_PCM_MODE_STREAM) {
pdprintf("params queue_size = %i\n", newparams.buf.stream.queue_size); pdprintf("params queue_size = %i\n", hwparams.buf.stream.queue_size);
newparams.buf.stream.queue_size = snd_pcm_plugin_hardware_size(pcm, newparams.channel, newparams.buf.stream.queue_size); hwparams.buf.stream.queue_size = snd_pcm_plugin_hardware_size(pcm, hwparams.channel, hwparams.buf.stream.queue_size);
newparams.buf.stream.max_fill = snd_pcm_plugin_hardware_size(pcm, newparams.channel, newparams.buf.stream.max_fill); hwparams.buf.stream.max_fill = snd_pcm_plugin_hardware_size(pcm, hwparams.channel, hwparams.buf.stream.max_fill);
pdprintf("params queue_size = %i\n", newparams.buf.stream.queue_size); pdprintf("params queue_size = %i\n", hwparams.buf.stream.queue_size);
} else if (params->mode == SND_PCM_MODE_BLOCK) { } else if (params->mode == SND_PCM_MODE_BLOCK) {
pdprintf("params frag_size = %i\n", newparams.buf.block.frag_size); pdprintf("params frag_size = %i\n", hwparams.buf.block.frag_size);
newparams.buf.block.frag_size = snd_pcm_plugin_hardware_size(pcm, newparams.channel, newparams.buf.block.frag_size); hwparams.buf.block.frag_size = snd_pcm_plugin_hardware_size(pcm, hwparams.channel, hwparams.buf.block.frag_size);
pdprintf("params frag_size = %i\n", newparams.buf.block.frag_size); pdprintf("params frag_size = %i\n", hwparams.buf.block.frag_size);
} else { } else {
return -EINVAL; return -EINVAL;
} }
pdprintf("params requested params: format = %i, rate = %i, voices = %i\n", newparams.format.format, newparams.format.rate, newparams.format.voices); pdprintf("params requested params: format = %i, rate = %i, voices = %i\n", hwparams.format.format, hwparams.format.rate, hwparams.format.voices);
err = snd_pcm_channel_params(pcm, &newparams); err = snd_pcm_channel_params(pcm, &hwparams);
if (err < 0) if (err < 0)
return err; return err;
err = snd_pcm_plugin_action(pcm, newparams.channel, INIT); err = snd_pcm_plugin_action(pcm, hwparams.channel, INIT);
if (err < 0) if (err < 0)
return err; return err;
return 0; return 0;

190
src/pcm/pcm_plugin_build.c
View file

@ -240,44 +240,45 @@ int snd_pcm_plugin_hwparams(snd_pcm_channel_params_t *params,
int snd_pcm_plugin_format(PLUGIN_BASE *pb, int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_channel_params_t *params, snd_pcm_channel_params_t *params,
snd_pcm_channel_params_t *hwparams, snd_pcm_channel_params_t *hwparams,
snd_pcm_channel_info_t *hwinfo, snd_pcm_channel_info_t *hwinfo)
snd_pcm_channel_params_t *newparams)
{ {
snd_pcm_channel_params_t tmpparams; snd_pcm_channel_params_t tmpparams;
snd_pcm_channel_params_t *dstparams; snd_pcm_channel_params_t dstparams;
snd_pcm_channel_params_t *srcparams;
snd_pcm_plugin_t *plugin; snd_pcm_plugin_t *plugin;
int err; int err;
if (params->channel == SND_PCM_CHANNEL_PLAYBACK) { if (params->channel == SND_PCM_CHANNEL_PLAYBACK) {
memcpy(newparams, params, sizeof(*params)); memcpy(&dstparams, hwparams, sizeof(*hwparams));
memcpy(&tmpparams, params, sizeof(*params)); srcparams = hwparams;
dstparams = hwparams; memcpy(srcparams, params, sizeof(*params));
} else { } else {
memcpy(newparams, hwparams, sizeof(*hwparams)); memcpy(&dstparams, params, sizeof(*params));
memcpy(&tmpparams, hwparams, sizeof(*hwparams)); srcparams = params;
dstparams = params; memcpy(srcparams, hwparams, sizeof(*hwparams));
} }
memcpy(&tmpparams, srcparams, sizeof(*srcparams));
pdprintf("newparams: interleave=%i, format=%i, rate=%i, voices=%i\n",
newparams->format.interleave, pdprintf("srcparams: interleave=%i, format=%i, rate=%i, voices=%i\n",
newparams->format.format, srcparams->format.interleave,
newparams->format.rate, srcparams->format.format,
newparams->format.voices); srcparams->format.rate,
srcparams->format.voices);
pdprintf("dstparams: interleave=%i, format=%i, rate=%i, voices=%i\n", pdprintf("dstparams: interleave=%i, format=%i, rate=%i, voices=%i\n",
dstparams->format.interleave, dstparams.format.interleave,
dstparams->format.format, dstparams.format.format,
dstparams->format.rate, dstparams.format.rate,
dstparams->format.voices); dstparams.format.voices);
/* Convert to interleaved format if needed */ /* Convert to interleaved format if needed */
if (!newparams->format.interleave && if (!srcparams->format.interleave &&
(newparams->format.voices != dstparams->format.voices || (srcparams->format.voices != dstparams.format.voices ||
(newparams->format.rate != dstparams->format.rate && (srcparams->format.rate != dstparams.format.rate &&
newparams->format.voices > 1))) { srcparams->format.voices > 1))) {
tmpparams.format.interleave = 1; tmpparams.format.interleave = 1;
err = snd_pcm_plugin_build_interleave(&newparams->format, err = snd_pcm_plugin_build_interleave(&srcparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params interleave change: src=%i, dst=%i returns %i\n", newparams->format.interleave, tmpparams.format.interleave, err); pdprintf("params interleave change: src=%i, dst=%i returns %i\n", srcparams->format.interleave, tmpparams.format.interleave, err);
if (err < 0) { if (err < 0) {
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
@ -287,20 +288,20 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
newparams->format.interleave = 1; srcparams->format.interleave = 1;
/* Avoid useless interleave revert */ /* Avoid useless interleave revert */
if (params->channel == SND_PCM_CHANNEL_PLAYBACK && if (params->channel == SND_PCM_CHANNEL_PLAYBACK &&
(hwinfo->flags & SND_PCM_CHNINFO_INTERLEAVE)) (hwinfo->flags & SND_PCM_CHNINFO_INTERLEAVE))
dstparams->format.interleave = 1; dstparams.format.interleave = 1;
} }
/* voices reduction */ /* voices reduction */
if (newparams->format.voices > dstparams->format.voices) { if (srcparams->format.voices > dstparams.format.voices) {
tmpparams.format.voices = dstparams->format.voices; tmpparams.format.voices = dstparams.format.voices;
err = snd_pcm_plugin_build_voices(&newparams->format, err = snd_pcm_plugin_build_voices(&srcparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params voices reduction: src=%i, dst=%i returns %i\n", newparams->format.voices, tmpparams.format.voices, err); pdprintf("params voices reduction: src=%i, dst=%i returns %i\n", srcparams->format.voices, tmpparams.format.voices, err);
if (err < 0) { if (err < 0) {
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
@ -310,19 +311,19 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
newparams->format.voices = dstparams->format.voices; srcparams->format.voices = tmpparams.format.voices;
} }
/* rate down resampling */ /* rate down resampling */
if (newparams->format.rate > dstparams->format.rate && if (srcparams->format.rate > dstparams.format.rate &&
snd_pcm_format_linear(newparams->format.format) && snd_pcm_format_linear(srcparams->format.format) &&
snd_pcm_format_width(newparams->format.format) <= 16 && snd_pcm_format_width(srcparams->format.format) <= 16 &&
snd_pcm_format_width(newparams->format.format) >= snd_pcm_format_width(newparams->format.format)) { snd_pcm_format_width(srcparams->format.format) >= snd_pcm_format_width(srcparams->format.format)) {
tmpparams.format.rate = dstparams->format.rate; tmpparams.format.rate = dstparams.format.rate;
err = snd_pcm_plugin_build_rate(&newparams->format, err = snd_pcm_plugin_build_rate(&srcparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params rate down resampling: src=%i, dst=%i returns %i\n", newparams->format.rate, tmpparams.format.rate, err); pdprintf("params rate down resampling: src=%i, dst=%i returns %i\n", srcparams->format.rate, tmpparams.format.rate, err);
if (err < 0) { if (err < 0) {
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
@ -332,36 +333,36 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
newparams->format.rate = dstparams->format.rate; srcparams->format.rate = tmpparams.format.rate;
} }
/* format change */ /* format change (linearization) */
if (newparams->format.format != dstparams->format.format) { if (srcparams->format.format != dstparams.format.format &&
tmpparams.format.format = dstparams->format.format; !snd_pcm_format_linear(srcparams->format.format) &&
switch (newparams->format.format) { !snd_pcm_format_linear(dstparams.format.format)) {
tmpparams.format.format = SND_PCM_SFMT_S16_LE;
switch (srcparams->format.format) {
case SND_PCM_SFMT_MU_LAW: case SND_PCM_SFMT_MU_LAW:
err = snd_pcm_plugin_build_mulaw(&newparams->format, err = snd_pcm_plugin_build_mulaw(&srcparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
break; break;
#ifndef __KERNEL__ #ifndef __KERNEL__
case SND_PCM_SFMT_A_LAW: case SND_PCM_SFMT_A_LAW:
err = snd_pcm_plugin_build_alaw(&newparams->format, err = snd_pcm_plugin_build_alaw(&srcparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
break; break;
case SND_PCM_SFMT_IMA_ADPCM: case SND_PCM_SFMT_IMA_ADPCM:
err = snd_pcm_plugin_build_adpcm(&newparams->format, err = snd_pcm_plugin_build_adpcm(&srcparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
break; break;
#endif #endif
default: default:
err = snd_pcm_plugin_build_linear(&newparams->format, return -EINVAL;
&tmpparams.format,
&plugin);
} }
pdprintf("params format change: src=%i, dst=%i returns %i\n", newparams->format.format, tmpparams.format.format, err); pdprintf("params format change: src=%i, dst=%i returns %i\n", srcparams->format.format, tmpparams.format.format, err);
if (err < 0) if (err < 0)
return err; return err;
err = snd_pcm_plugin_append(pb, params->channel, plugin); err = snd_pcm_plugin_append(pb, params->channel, plugin);
@ -369,16 +370,58 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
newparams->format.format = dstparams->format.format; srcparams->format.format = tmpparams.format.format;
}
/* format change */
if (srcparams->format.format != dstparams.format.format) {
tmpparams.format.format = dstparams.format.format;
if (srcparams->format.format == SND_PCM_SFMT_MU_LAW ||
tmpparams.format.format == SND_PCM_SFMT_MU_LAW) {
err = snd_pcm_plugin_build_mulaw(&srcparams->format,
&tmpparams.format,
&plugin);
}
#ifndef __KERNEL__
else if (srcparams->format.format == SND_PCM_SFMT_A_LAW ||
tmpparams.format.format == SND_PCM_SFMT_A_LAW) {
err = snd_pcm_plugin_build_alaw(&srcparams->format,
&tmpparams.format,
&plugin);
}
else if (srcparams->format.format == SND_PCM_SFMT_IMA_ADPCM ||
tmpparams.format.format == SND_PCM_SFMT_IMA_ADPCM) {
err = snd_pcm_plugin_build_adpcm(&srcparams->format,
&tmpparams.format,
&plugin);
}
#endif
else if (snd_pcm_format_linear(srcparams->format.format) &&
snd_pcm_format_linear(tmpparams.format.format)) {
err = snd_pcm_plugin_build_linear(&srcparams->format,
&tmpparams.format,
&plugin);
}
else
return -EINVAL;
pdprintf("params format change: src=%i, dst=%i returns %i\n", srcparams->format.format, tmpparams.format.format, err);
if (err < 0)
return err;
err = snd_pcm_plugin_append(pb, params->channel, plugin);
if (err < 0) {
snd_pcm_plugin_free(plugin);
return err;
}
srcparams->format.format = tmpparams.format.format;
} }
/* rate resampling */ /* rate resampling */
if (newparams->format.rate != dstparams->format.rate) { if (srcparams->format.rate != dstparams.format.rate) {
tmpparams.format.rate = dstparams->format.rate; tmpparams.format.rate = dstparams.format.rate;
err = snd_pcm_plugin_build_rate(&newparams->format, err = snd_pcm_plugin_build_rate(&srcparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params rate resampling: src=%i, dst=%i return %i\n", newparams->format.rate, tmpparams.format.rate, err); pdprintf("params rate resampling: src=%i, dst=%i return %i\n", srcparams->format.rate, tmpparams.format.rate, err);
if (err < 0) { if (err < 0) {
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
@ -388,16 +431,16 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
newparams->format.rate = dstparams->format.rate; srcparams->format.rate = tmpparams.format.rate;
} }
/* voices extension */ /* voices extension */
if (newparams->format.voices != dstparams->format.voices) { if (srcparams->format.voices != dstparams.format.voices) {
tmpparams.format.voices = dstparams->format.voices; tmpparams.format.voices = dstparams.format.voices;
err = snd_pcm_plugin_build_voices(&newparams->format, err = snd_pcm_plugin_build_voices(&srcparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params voices extension: src=%i, dst=%i returns %i\n", newparams->format.voices, tmpparams.format.voices, err); pdprintf("params voices extension: src=%i, dst=%i returns %i\n", srcparams->format.voices, tmpparams.format.voices, err);
if (err < 0) { if (err < 0) {
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
@ -407,18 +450,18 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
newparams->format.voices = dstparams->format.voices; srcparams->format.voices = tmpparams.format.voices;
} }
/* interleave change */ /* interleave change */
if (dstparams->format.voices > 1 && if (dstparams.format.voices > 1 &&
hwinfo->mode == SND_PCM_MODE_BLOCK && hwinfo->mode == SND_PCM_MODE_BLOCK &&
newparams->format.interleave != dstparams->format.interleave) { srcparams->format.interleave != dstparams.format.interleave) {
tmpparams.format.interleave = dstparams->format.interleave; tmpparams.format.interleave = dstparams.format.interleave;
err = snd_pcm_plugin_build_interleave(&newparams->format, err = snd_pcm_plugin_build_interleave(&srcparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params interleave change: src=%i, dst=%i return %i\n", newparams->format.interleave, tmpparams.format.interleave, err); pdprintf("params interleave change: src=%i, dst=%i return %i\n", srcparams->format.interleave, tmpparams.format.interleave, err);
if (err < 0) { if (err < 0) {
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
@ -428,11 +471,12 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
newparams->format.interleave = dstparams->format.interleave; srcparams->format.interleave = tmpparams.format.interleave;
} }
pdprintf("newparams: interleave=%i, format=%i, rate=%i, voices=%i\n",
if (params->channel == SND_PCM_CHANNEL_CAPTURE) srcparams->format.interleave,
*newparams = *hwparams; srcparams->format.format,
srcparams->format.rate,
srcparams->format.voices);
return 0; return 0;
} }