channelmix: add default channelmap for 5 and 7 channels

This commit is contained in:
Wim Taymans 2020-09-04 12:22:30 +02:00
parent 950e81c5fb
commit 3eafa6312f

View file

@ -168,14 +168,17 @@ static uint64_t default_mask(uint32_t channels)
{ {
uint64_t mask = 0; uint64_t mask = 0;
switch (channels) { switch (channels) {
case 7:
case 8: case 8:
mask |= _MASK(RL); mask |= _MASK(RL);
mask |= _MASK(RR); mask |= _MASK(RR);
/* fallthrough */ /* fallthrough */
case 5:
case 6: case 6:
mask |= _MASK(SL); mask |= _MASK(SL);
mask |= _MASK(SR); mask |= _MASK(SR);
mask |= _MASK(LFE); if ((channels & 1) == 0)
mask |= _MASK(LFE);
/* fallthrough */ /* fallthrough */
case 3: case 3:
mask |= _MASK(FC); mask |= _MASK(FC);