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

output/alsa: support DSD_U16

This commit is contained in:
Max Kellermann 2017-01-11 22:33:52 +01:00
parent 938affef32
commit 70008c47c9
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -6,6 +6,7 @@ ver 0.20.2 (not yet released)
* output * output
- alsa: fix the DSD_U32 sample rate - alsa: fix the DSD_U32 sample rate
- alsa: fix the DSD_U32 byte order - alsa: fix the DSD_U32 byte order
- alsa: support DSD_U16
ver 0.20.1 (2017/01/09) ver 0.20.1 (2017/01/09)
* input * input

20
src/output/plugins/AlsaOutputPlugin.cxx
View File

@ -385,7 +385,7 @@ AlsaTryFormatOrByteSwap(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
/** /**
* Attempts to configure the specified sample format. On DSD_U8 * Attempts to configure the specified sample format. On DSD_U8
* failure, attempt to switch to DSD_U32. * failure, attempt to switch to DSD_U32 or DSD_U16.
*/ */
static int static int
AlsaTryFormatDsd(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams, AlsaTryFormatDsd(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
@ -394,8 +394,10 @@ AlsaTryFormatDsd(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
int err = AlsaTryFormatOrByteSwap(pcm, hwparams, fmt, params); int err = AlsaTryFormatOrByteSwap(pcm, hwparams, fmt, params);
#if defined(ENABLE_DSD) && defined(HAVE_ALSA_DSD_U32) #if defined(ENABLE_DSD) && defined(HAVE_ALSA_DSD_U32)
if (err == 0) if (err == 0) {
params.dsd_u16 = false;
params.dsd_u32 = false; params.dsd_u32 = false;
}
if (err == -EINVAL && fmt == SND_PCM_FORMAT_DSD_U8) { if (err == -EINVAL && fmt == SND_PCM_FORMAT_DSD_U8) {
/* attempt to switch to DSD_U32 */ /* attempt to switch to DSD_U32 */
@ -405,6 +407,20 @@ AlsaTryFormatDsd(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
err = AlsaTryFormatOrByteSwap(pcm, hwparams, fmt, params); err = AlsaTryFormatOrByteSwap(pcm, hwparams, fmt, params);
if (err == 0) if (err == 0)
params.dsd_u32 = true; params.dsd_u32 = true;
else
fmt = SND_PCM_FORMAT_DSD_U8;
}
if (err == -EINVAL && fmt == SND_PCM_FORMAT_DSD_U8) {
/* attempt to switch to DSD_U16 */
fmt = IsLittleEndian()
? SND_PCM_FORMAT_DSD_U16_LE
: SND_PCM_FORMAT_DSD_U16_BE;
err = AlsaTryFormatOrByteSwap(pcm, hwparams, fmt, params);
if (err == 0)
params.dsd_u16 = true;
else
fmt = SND_PCM_FORMAT_DSD_U8;
} }
#endif #endif