oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/alsa: merged code into alsa_output_try_format()

Browse Source 
Remove the debug log messages, because they are duplicate (see
ao_open() in output_thread.c).
This commit is contained in:
Max Kellermann 2010-01-16 17:41:28 +01:00
parent 579a8a96ea
commit 96546c1a8a
1 changed files with 73 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/output/alsa_plugin.c
View File

@ -217,6 +217,48 @@ byteswap_bitformat(snd_pcm_format_t fmt)
} }
} }
/**
* Attempts to configure the specified sample format.
*/
static int
alsa_output_try_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
struct audio_format *audio_format,
enum sample_format sample_format)
{
snd_pcm_format_t alsa_format = get_bitformat(sample_format);
if (alsa_format == SND_PCM_FORMAT_UNKNOWN)
return -EINVAL;
int err = snd_pcm_hw_params_set_format(pcm, hwparams, alsa_format);
if (err == 0)
audio_format->format = sample_format;
return err;
}
/**
* Attempts to configure the specified sample format with reversed
* host byte order.
*/
static int
alsa_output_try_reverse(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
struct audio_format *audio_format,
enum sample_format sample_format)
{
snd_pcm_format_t alsa_format =
byteswap_bitformat(get_bitformat(sample_format));
if (alsa_format == SND_PCM_FORMAT_UNKNOWN)
return -EINVAL;
int err = snd_pcm_hw_params_set_format(pcm, hwparams, alsa_format);
if (err == 0) {
audio_format->format = sample_format;
audio_format->reverse_endian = true;
}
return err;
}
/** /**
* Configure a sample format, and probe other formats if that fails. * Configure a sample format, and probe other formats if that fails.
*/ */
@ -234,66 +276,44 @@ alsa_output_setup_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
} }
int err = snd_pcm_hw_params_set_format(pcm, hwparams, bitformat); int err = snd_pcm_hw_params_set_format(pcm, hwparams, bitformat);
if (err == -EINVAL && if (err != -EINVAL)
byteswap_bitformat(bitformat) != SND_PCM_FORMAT_UNKNOWN) { return err;
err = snd_pcm_hw_params_set_format(pcm, hwparams,
byteswap_bitformat(bitformat));
if (err == 0) {
g_debug("converting format %s to reverse-endian",
sample_format_to_string(audio_format->format));
audio_format->reverse_endian = 1;
}
}
if (err == -EINVAL && (audio_format->format == SAMPLE_FORMAT_S24_P32 || err = alsa_output_try_reverse(pcm, hwparams, audio_format,
audio_format->format == SAMPLE_FORMAT_S16)) { audio_format->format);
if (err != -EINVAL)
return err;
if (audio_format->format == SAMPLE_FORMAT_S24_P32 ||
audio_format->format == SAMPLE_FORMAT_S16) {
/* fall back to 32 bit, let pcm_convert.c do the conversion */ /* fall back to 32 bit, let pcm_convert.c do the conversion */
err = snd_pcm_hw_params_set_format(pcm, hwparams,
SND_PCM_FORMAT_S32); err = alsa_output_try_format(pcm, hwparams, audio_format,
if (err == 0) { SAMPLE_FORMAT_S24_P32);
g_debug("converting format %s to 32 bit\n", if (err != -EINVAL)
sample_format_to_string(audio_format->format)); return err;
audio_format->format = SAMPLE_FORMAT_S32;
} err = alsa_output_try_reverse(pcm, hwparams, audio_format,
SAMPLE_FORMAT_S24_P32);
if (err != -EINVAL)
return err;
} }
if (err == -EINVAL && (audio_format->format == SAMPLE_FORMAT_S24_P32 || if (audio_format->format != SAMPLE_FORMAT_S16) {
audio_format->format == SAMPLE_FORMAT_S16)) {
/* fall back to 32 bit, let pcm_convert.c do the conversion */
err = snd_pcm_hw_params_set_format(pcm, hwparams,
byteswap_bitformat(SND_PCM_FORMAT_S32));
if (err == 0) {
g_debug("converting format %s to 32 bit backward-endian\n",
sample_format_to_string(audio_format->format));
audio_format->format = SAMPLE_FORMAT_S32;
audio_format->reverse_endian = 1;
}
}
if (err == -EINVAL && audio_format->format != SAMPLE_FORMAT_S16) {
/* fall back to 16 bit, let pcm_convert.c do the conversion */ /* fall back to 16 bit, let pcm_convert.c do the conversion */
err = snd_pcm_hw_params_set_format(pcm, hwparams,
SND_PCM_FORMAT_S16); err = alsa_output_try_format(pcm, hwparams, audio_format,
if (err == 0) { SAMPLE_FORMAT_S16);
g_debug("converting format %s to 16 bit\n", if (err != -EINVAL)
sample_format_to_string(audio_format->format)); return err;
audio_format->format = SAMPLE_FORMAT_S16;
} err = alsa_output_try_reverse(pcm, hwparams, audio_format,
SAMPLE_FORMAT_S16);
if (err != -EINVAL)
return err;
} }
if (err == -EINVAL && audio_format->format != SAMPLE_FORMAT_S16) { return -EINVAL;
/* fall back to 16 bit, let pcm_convert.c do the conversion */
err = snd_pcm_hw_params_set_format(pcm, hwparams,
byteswap_bitformat(SND_PCM_FORMAT_S16));
if (err == 0) {
g_debug("converting format %s to 16 bit backward-endian\n",
sample_format_to_string(audio_format->format));
audio_format->format = SAMPLE_FORMAT_S16;
audio_format->reverse_endian = 1;
}
}
return err;
} }
/** /**