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

direct pcm plugins: fix format selection

Browse source 
The old format tried to do something when the requested format was not
supported by the hardware, but did not actually select any other format.
Now we try to switch to any format supported by dmix, or any other
format when the plugin is not dmix.
This commit is contained in:
Clemens Ladisch 2006-12-04 18:20:40 +01:00
parent 9819099e0e
commit 8a36b67b9f
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/pcm/pcm_direct.c
View file

@ -877,22 +877,26 @@ int snd_pcm_direct_initialize_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, str
} }
ret = snd_pcm_hw_params_set_format(spcm, hw_params, params->format); ret = snd_pcm_hw_params_set_format(spcm, hw_params, params->format);
if (ret < 0) { if (ret < 0) {
static const snd_pcm_format_t dmix_formats[] = {
SND_PCM_FORMAT_S32,
SND_PCM_FORMAT_S32 ^ SND_PCM_FORMAT_S32_LE ^ SND_PCM_FORMAT_S32_BE,
SND_PCM_FORMAT_S16,
SND_PCM_FORMAT_S16 ^ SND_PCM_FORMAT_S16_LE ^ SND_PCM_FORMAT_S16_BE,
SND_PCM_FORMAT_S24_3LE,
};
snd_pcm_format_t format; snd_pcm_format_t format;
if (dmix->type == SND_PCM_TYPE_DMIX) { int i;
switch (params->format) {
case SND_PCM_FORMAT_S32_LE: for (i = 0; i < sizeof dmix_formats / sizeof dmix_formats[0]; ++i) {
case SND_PCM_FORMAT_S32_BE: format = dmix_formats[i];
case SND_PCM_FORMAT_S16_LE: ret = snd_pcm_hw_params_set_format(spcm, hw_params, format);
case SND_PCM_FORMAT_S16_BE: if (ret >= 0)
case SND_PCM_FORMAT_S24_3LE:
break; break;
default:
SNDERR("invalid format");
return -EINVAL;
}
} }
format = params->format; if (ret < 0 && dmix->type != SND_PCM_TYPE_DMIX) {
ret = snd_pcm_hw_params_set_format(spcm, hw_params, format); /* TODO: try to choose a good format */
ret = snd_pcm_hw_params_set_format_first(spcm, hw_params, &format);
}
if (ret < 0) { if (ret < 0) {
SNDERR("requested or auto-format is not available"); SNDERR("requested or auto-format is not available");
return ret; return ret;