[vlc-commits] auhal: fix 7.1 channel layout for macOS - fix #17556

[Andrii Zui]

vlc | branch: master | Andrii Zui <andrew.zui at outlook.com> | Mon Dec 12 17:41:20 2016 +0000| [974b4af5bba0ffe957679256b938c47f21308680] | committer: Jean-Baptiste Kempf

auhal: fix 7.1 channel layout for macOS - fix #17556

Currently AUHAL drops rear surround channels if device layout is set to
`L R C LFE Rls Rrs Ls Rs` because it expects Left Center and Right Center
channels instead (as in MPEG_7_1_A). Setting input_layout to MPEG_7_1_C fixes
this issue.

Note that setting device layout to e.g. `L R C LFE Ls Rs Lc Rc` doesn't help,
because VLC doesn't recognize Lc/Rc channels - they're not present in
i_auhal_channel_mapping.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=974b4af5bba0ffe957679256b938c47f21308680
---

 modules/audio_output/auhal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 0ea242a..aad4d8a 100644
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -751,7 +751,7 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
             break;
         case 8:
             if (fmt->i_physical_channels & (AOUT_CHAN_LFE) || currentMinorSystemVersion < 7) {
-                input_layout.mChannelLayoutTag = kAudioChannelLayoutTag_MPEG_7_1_A; // L R C LFE Ls Rs Lc Rc
+                input_layout.mChannelLayoutTag = kAudioChannelLayoutTag_MPEG_7_1_C; // L R C LFE Ls Rs Rls Rrs
 
                 chans_out[0] = AOUT_CHAN_LEFT;
                 chans_out[1] = AOUT_CHAN_RIGHT;