ALSA: favor channel maps with fewer unused channels

a9aba401 · Rémi Denis-Courmont · ec329647 · a9aba401
Commit a9aba401 authored Jul 25, 2013 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

modules/audio_output/alsa.c modules/audio_output/alsa.c +2 -1

No files found.
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -241,7 +241,8 @@ static unsigned SetupChannels (vlc_object_t *obj, snd_pcm_t *pcm,
        if (chans == -1)
            continue;

-        unsigned score = popcount (chans & *mask);
+        unsigned score = (popcount (chans & *mask) << 8)
+                       | (255 - popcount (chans));
        if (score > best_score)
        {
            best_offset = p - maps;