mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: prefer planar formats

Browse source 
They are easier to convert
This commit is contained in:
Wim Taymans 2021-01-15 15:18:39 +01:00
parent 5817b66a20
commit 2ff4615e53
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spa/plugins/alsa/alsa-pcm.c
View file

@ -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]; const struct format_info *fi = &format_info[i];
if (snd_pcm_format_mask_test(fmask, fi->format)) { 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) || if ((snd_pcm_access_mask_test(amask, SND_PCM_ACCESS_MMAP_NONINTERLEAVED) ||
snd_pcm_access_mask_test(amask, SND_PCM_ACCESS_RW_NONINTERLEAVED)) && snd_pcm_access_mask_test(amask, SND_PCM_ACCESS_RW_NONINTERLEAVED)) &&
fi->spa_pformat != SPA_AUDIO_FORMAT_UNKNOWN && 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);
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) { if (j == 0) {