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 
Sat, 11 Dec 1999 16:16:34 +0100
- PCM plugin fixes
This commit is contained in:
Jaroslav Kysela 1999-12-11 20:08:34 +00:00
parent 20ebae20a7
commit 00f2df9954
4 changed files with 72 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/pcm/pcm_local.h
View file

@ -47,7 +47,8 @@ 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

24
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; snd_pcm_channel_params_t hwparams, newparams;
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,7 @@ 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)) < 0) if ((err = snd_pcm_plugin_format(pcm, params, &hwparams, &hwinfo, &newparams)) < 0)
return err; return err;
/* /*
@ -279,22 +279,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", hwparams.buf.stream.queue_size); pdprintf("params queue_size = %i\n", 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.queue_size = snd_pcm_plugin_hardware_size(pcm, newparams.channel, newparams.buf.stream.queue_size);
hwparams.buf.stream.max_fill = snd_pcm_plugin_hardware_size(pcm, hwparams.channel, hwparams.buf.stream.max_fill); newparams.buf.stream.max_fill = snd_pcm_plugin_hardware_size(pcm, newparams.channel, newparams.buf.stream.max_fill);
pdprintf("params queue_size = %i\n", hwparams.buf.stream.queue_size); pdprintf("params queue_size = %i\n", newparams.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", hwparams.buf.block.frag_size); pdprintf("params frag_size = %i\n", newparams.buf.block.frag_size);
hwparams.buf.block.frag_size = snd_pcm_plugin_hardware_size(pcm, hwparams.channel, hwparams.buf.block.frag_size); newparams.buf.block.frag_size = snd_pcm_plugin_hardware_size(pcm, newparams.channel, newparams.buf.block.frag_size);
pdprintf("params frag_size = %i\n", hwparams.buf.block.frag_size); pdprintf("params frag_size = %i\n", newparams.buf.block.frag_size);
} else { } else {
return -EINVAL; return -EINVAL;
} }
pdprintf("params requested params: format = %i, rate = %i, voices = %i\n", hwparams.format.format, hwparams.format.rate, hwparams.format.voices); pdprintf("params requested params: format = %i, rate = %i, voices = %i\n", newparams.format.format, newparams.format.rate, newparams.format.voices);
err = snd_pcm_channel_params(pcm, &hwparams); err = snd_pcm_channel_params(pcm, &newparams);
if (err < 0) if (err < 0)
return err; return err;
err = snd_pcm_plugin_action(pcm, hwparams.channel, INIT); err = snd_pcm_plugin_action(pcm, newparams.channel, INIT);
if (err < 0) if (err < 0)
return err; return err;
return 0; return 0;

115
src/pcm/pcm_plugin_build.c
View file

@ -99,7 +99,10 @@ ssize_t snd_pcm_plugin_hardware_size(PLUGIN_BASE *pb, int channel, size_t trf_si
unsigned int snd_pcm_plugin_formats(unsigned int formats) unsigned int snd_pcm_plugin_formats(unsigned int formats)
{ {
formats |= SND_PCM_FMT_MU_LAW | SND_PCM_FMT_A_LAW | SND_PCM_FMT_IMA_ADPCM; formats |= SND_PCM_FMT_MU_LAW;
#ifndef __KERNEL__
formats |= SND_PCM_FMT_A_LAW | SND_PCM_FMT_IMA_ADPCM;
#endif
if (formats & (SND_PCM_FMT_U8|SND_PCM_FMT_S8| if (formats & (SND_PCM_FMT_U8|SND_PCM_FMT_S8|
SND_PCM_FMT_U16_LE|SND_PCM_FMT_S16_LE)) SND_PCM_FMT_U16_LE|SND_PCM_FMT_S16_LE))
formats |= SND_PCM_FMT_U8|SND_PCM_FMT_S8| formats |= SND_PCM_FMT_U8|SND_PCM_FMT_S8|
@ -237,43 +240,44 @@ 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 srcparams, tmpparams; snd_pcm_channel_params_t tmpparams;
snd_pcm_channel_params_t *dstparams; snd_pcm_channel_params_t *dstparams;
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(&srcparams, params, sizeof(srcparams)); memcpy(newparams, params, sizeof(*params));
memcpy(&tmpparams, params, sizeof(tmpparams)); memcpy(&tmpparams, params, sizeof(*params));
dstparams = hwparams; dstparams = hwparams;
} else { } else {
memcpy(&srcparams, &hwparams, sizeof(srcparams)); memcpy(newparams, hwparams, sizeof(*hwparams));
memcpy(&tmpparams, &hwparams, sizeof(tmpparams)); memcpy(&tmpparams, hwparams, sizeof(*hwparams));
dstparams = params; dstparams = params;
} }
pdprintf("srcparams: interleave=%i, format=%i, rate=%i, voices=%i\n", pdprintf("newparams: interleave=%i, format=%i, rate=%i, voices=%i\n",
srcparams.format.interleave, newparams->format.interleave,
srcparams.format.format, newparams->format.format,
srcparams.format.rate, newparams->format.rate,
srcparams.format.voices); newparams->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 (!srcparams.format.interleave && if (!newparams->format.interleave &&
(srcparams.format.voices != dstparams->format.voices || (newparams->format.voices != dstparams->format.voices ||
(srcparams.format.rate != dstparams->format.rate && (newparams->format.rate != dstparams->format.rate &&
srcparams.format.voices > 1))) { newparams->format.voices > 1))) {
tmpparams.format.interleave = 1; tmpparams.format.interleave = 1;
err = snd_pcm_plugin_build_interleave(&srcparams.format, err = snd_pcm_plugin_build_interleave(&newparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params interleave change: src=%i, dst=%i returns %i\n", srcparams.format.interleave, tmpparams.format.interleave, err); pdprintf("params interleave change: src=%i, dst=%i returns %i\n", newparams->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;
@ -283,7 +287,7 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
srcparams.format.interleave = 1; newparams->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))
@ -291,12 +295,12 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
} }
/* voices reduction */ /* voices reduction */
if (srcparams.format.voices > dstparams->format.voices) { if (newparams->format.voices > dstparams->format.voices) {
tmpparams.format.voices = dstparams->format.voices; tmpparams.format.voices = dstparams->format.voices;
err = snd_pcm_plugin_build_voices(&srcparams.format, err = snd_pcm_plugin_build_voices(&newparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params voices reduction: src=%i, dst=%i returns %i\n", srcparams.format.voices, tmpparams.format.voices, err); pdprintf("params voices reduction: src=%i, dst=%i returns %i\n", newparams->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;
@ -306,19 +310,19 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
srcparams.format.voices = dstparams->format.voices; newparams->format.voices = dstparams->format.voices;
} }
/* rate down resampling */ /* rate down resampling */
if (srcparams.format.rate > dstparams->format.rate && if (newparams->format.rate > dstparams->format.rate &&
snd_pcm_format_linear(srcparams.format.format) && snd_pcm_format_linear(newparams->format.format) &&
snd_pcm_format_width(srcparams.format.format) <= 16 && snd_pcm_format_width(newparams->format.format) <= 16 &&
snd_pcm_format_width(srcparams.format.format) >= snd_pcm_format_width(srcparams.format.format)) { snd_pcm_format_width(newparams->format.format) >= snd_pcm_format_width(newparams->format.format)) {
tmpparams.format.rate = dstparams->format.rate; tmpparams.format.rate = dstparams->format.rate;
err = snd_pcm_plugin_build_rate(&srcparams.format, err = snd_pcm_plugin_build_rate(&newparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params rate down resampling: src=%i, dst=%i\n returns %i", srcparams.format.rate, tmpparams.format.rate, err); pdprintf("params rate down resampling: src=%i, dst=%i returns %i\n", newparams->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;
@ -328,36 +332,36 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
srcparams.format.rate = dstparams->format.rate; newparams->format.rate = dstparams->format.rate;
} }
/* format change */ /* format change */
if (srcparams.format.format != dstparams->format.format) { if (newparams->format.format != dstparams->format.format) {
tmpparams.format.format = dstparams->format.format; tmpparams.format.format = dstparams->format.format;
switch (srcparams.format.format) { switch (newparams->format.format) {
case SND_PCM_SFMT_MU_LAW: case SND_PCM_SFMT_MU_LAW:
err = snd_pcm_plugin_build_mulaw(&srcparams.format, err = snd_pcm_plugin_build_mulaw(&newparams->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(&srcparams.format, err = snd_pcm_plugin_build_alaw(&newparams->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(&srcparams.format, err = snd_pcm_plugin_build_adpcm(&newparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
break; break;
#endif #endif
default: default:
err = snd_pcm_plugin_build_linear(&srcparams.format, err = snd_pcm_plugin_build_linear(&newparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
} }
pdprintf("params format change: src=%i, dst=%i returns %i\n", srcparams.format.format, tmpparams.format.format, err); pdprintf("params format change: src=%i, dst=%i returns %i\n", newparams->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);
@ -365,16 +369,16 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
srcparams.format.format = dstparams->format.format; newparams->format.format = dstparams->format.format;
} }
/* rate resampling */ /* rate resampling */
if (srcparams.format.rate != dstparams->format.rate) { if (newparams->format.rate != dstparams->format.rate) {
tmpparams.format.rate = dstparams->format.rate; tmpparams.format.rate = dstparams->format.rate;
err = snd_pcm_plugin_build_rate(&srcparams.format, err = snd_pcm_plugin_build_rate(&newparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params rate resampling: src=%i, dst=%i return %i\n", srcparams.format.rate, tmpparams.format.rate, err); pdprintf("params rate resampling: src=%i, dst=%i return %i\n", newparams->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;
@ -384,16 +388,16 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
srcparams.format.rate = dstparams->format.rate; newparams->format.rate = dstparams->format.rate;
} }
/* voices extension */ /* voices extension */
if (srcparams.format.voices != dstparams->format.voices) { if (newparams->format.voices != dstparams->format.voices) {
tmpparams.format.voices = dstparams->format.voices; tmpparams.format.voices = dstparams->format.voices;
err = snd_pcm_plugin_build_voices(&srcparams.format, err = snd_pcm_plugin_build_voices(&newparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params voices extension: src=%i, dst=%i returns %i\n", srcparams.format.voices, tmpparams.format.voices, err); pdprintf("params voices extension: src=%i, dst=%i returns %i\n", newparams->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;
@ -403,18 +407,18 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
srcparams.format.voices = dstparams->format.voices; newparams->format.voices = dstparams->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 &&
srcparams.format.interleave != dstparams->format.interleave) { newparams->format.interleave != dstparams->format.interleave) {
tmpparams.format.interleave = dstparams->format.interleave; tmpparams.format.interleave = dstparams->format.interleave;
err = snd_pcm_plugin_build_interleave(&srcparams.format, err = snd_pcm_plugin_build_interleave(&newparams->format,
&tmpparams.format, &tmpparams.format,
&plugin); &plugin);
pdprintf("params interleave change: src=%i, dst=%i return %i\n", srcparams.format.interleave, tmpparams.format.interleave, err); pdprintf("params interleave change: src=%i, dst=%i return %i\n", newparams->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;
@ -424,16 +428,9 @@ int snd_pcm_plugin_format(PLUGIN_BASE *pb,
snd_pcm_plugin_free(plugin); snd_pcm_plugin_free(plugin);
return err; return err;
} }
srcparams.format.interleave = dstparams->format.interleave; newparams->format.interleave = dstparams->format.interleave;
} }
if (srcparams.format.interleave != dstparams->format.interleave &&
srcparams.format.voices > 1)
return -EINVAL;
if (srcparams.format.format != dstparams->format.format)
return -EINVAL;
if (srcparams.format.rate != dstparams->format.rate)
return -EINVAL;
if (srcparams.format.voices != dstparams->format.voices)
return -EINVAL;
return 0; return 0;
} }

1
src/pcm/plugin/voices.c
View file

@ -21,6 +21,7 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include "../../include/driver.h" #include "../../include/driver.h"
#include "../../include/pcm.h"
#include "../../include/pcm_plugin.h" #include "../../include/pcm_plugin.h"
#else #else
#include <stdio.h> #include <stdio.h>