From 2ff4615e5386fc076917fcad3050237f53e771ac Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 15 Jan 2021 15:18:39 +0100 Subject: [PATCH] alsa: prefer planar formats They are easier to convert --- spa/plugins/alsa/alsa-pcm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spa/plugins/alsa/alsa-pcm.c b/spa/plugins/alsa/alsa-pcm.c index e100621ff..3fda9f195 100644 --- a/spa/plugins/alsa/alsa-pcm.c +++ b/spa/plugins/alsa/alsa-pcm.c @@ -319,13 +319,6 @@ spa_alsa_enum_format(struct state *state, int seq, uint32_t start, uint32_t num, const struct format_info *fi = &format_info[i]; if (snd_pcm_format_mask_test(fmask, fi->format)) { - if ((snd_pcm_access_mask_test(amask, SND_PCM_ACCESS_MMAP_INTERLEAVED) || - snd_pcm_access_mask_test(amask, SND_PCM_ACCESS_RW_INTERLEAVED)) && - (state->default_format == 0 || state->default_format == fi->spa_format)) { - if (j++ == 0) - spa_pod_builder_id(&b, fi->spa_format); - spa_pod_builder_id(&b, fi->spa_format); - } if ((snd_pcm_access_mask_test(amask, SND_PCM_ACCESS_MMAP_NONINTERLEAVED) || snd_pcm_access_mask_test(amask, SND_PCM_ACCESS_RW_NONINTERLEAVED)) && fi->spa_pformat != SPA_AUDIO_FORMAT_UNKNOWN && @@ -334,6 +327,13 @@ spa_alsa_enum_format(struct state *state, int seq, uint32_t start, uint32_t num, spa_pod_builder_id(&b, fi->spa_pformat); spa_pod_builder_id(&b, fi->spa_pformat); } + if ((snd_pcm_access_mask_test(amask, SND_PCM_ACCESS_MMAP_INTERLEAVED) || + snd_pcm_access_mask_test(amask, SND_PCM_ACCESS_RW_INTERLEAVED)) && + (state->default_format == 0 || state->default_format == fi->spa_format)) { + if (j++ == 0) + spa_pod_builder_id(&b, fi->spa_format); + spa_pod_builder_id(&b, fi->spa_format); + } } } if (j == 0) {