From b044f08149f2d46641ba0fdde89dc5dbc0450b6a Mon Sep 17 00:00:00 2001 From: rcombs Date: Wed, 17 Jun 2020 21:01:44 -0500 Subject: ao_coreaudio: fix some incorrect channel mappings --- audio/out/ao_coreaudio_chmap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/audio/out/ao_coreaudio_chmap.c b/audio/out/ao_coreaudio_chmap.c index 13ac87e2ba..a1b2b82d96 100644 --- a/audio/out/ao_coreaudio_chmap.c +++ b/audio/out/ao_coreaudio_chmap.c @@ -26,13 +26,13 @@ static const int speaker_map[][2] = { { kAudioChannelLabel_Right, MP_SPEAKER_ID_FR }, { kAudioChannelLabel_Center, MP_SPEAKER_ID_FC }, { kAudioChannelLabel_LFEScreen, MP_SPEAKER_ID_LFE }, - { kAudioChannelLabel_LeftSurround, MP_SPEAKER_ID_BL }, - { kAudioChannelLabel_RightSurround, MP_SPEAKER_ID_BR }, + { kAudioChannelLabel_LeftSurround, MP_SPEAKER_ID_SL }, + { kAudioChannelLabel_RightSurround, MP_SPEAKER_ID_SR }, { kAudioChannelLabel_LeftCenter, MP_SPEAKER_ID_FLC }, { kAudioChannelLabel_RightCenter, MP_SPEAKER_ID_FRC }, { kAudioChannelLabel_CenterSurround, MP_SPEAKER_ID_BC }, - { kAudioChannelLabel_LeftSurroundDirect, MP_SPEAKER_ID_SL }, - { kAudioChannelLabel_RightSurroundDirect, MP_SPEAKER_ID_SR }, + { kAudioChannelLabel_RearSurroundLeft, MP_SPEAKER_ID_BL }, + { kAudioChannelLabel_RearSurroundRight, MP_SPEAKER_ID_BR }, { kAudioChannelLabel_TopCenterSurround, MP_SPEAKER_ID_TC }, { kAudioChannelLabel_VerticalHeightLeft, MP_SPEAKER_ID_TFL }, { kAudioChannelLabel_VerticalHeightCenter, MP_SPEAKER_ID_TFC }, @@ -42,8 +42,8 @@ static const int speaker_map[][2] = { { kAudioChannelLabel_TopBackRight, MP_SPEAKER_ID_TBR }, // unofficial extensions - { kAudioChannelLabel_RearSurroundLeft, MP_SPEAKER_ID_SDL }, - { kAudioChannelLabel_RearSurroundRight, MP_SPEAKER_ID_SDR }, + { kAudioChannelLabel_LeftSurroundDirect, MP_SPEAKER_ID_SDL }, + { kAudioChannelLabel_RightSurroundDirect, MP_SPEAKER_ID_SDR }, { kAudioChannelLabel_LeftWide, MP_SPEAKER_ID_WL }, { kAudioChannelLabel_RightWide, MP_SPEAKER_ID_WR }, { kAudioChannelLabel_LFE2, MP_SPEAKER_ID_LFE2 }, -- cgit v1.2.3