diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-07-14 02:28:13 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-07-14 02:28:12 -0700 |
| commit | a3db77e663579f4ac2dddd5ccd9fbfb072aac306 (patch) | |
| tree | db22b65b6504736bd629b8a0e9840e1f9cd5ebc4 | |
| parent | 2fb8f5172de5d16ae9644f24f6374e5a5290f701 (diff) | |
| parent | 70ee8c652464c8858a7103fbc1f0c395c5e2f474 (diff) | |
Merge "dsp: q6adm: Channel map configuration for multi-channel"
| -rw-r--r-- | sound/soc/msm/qdsp6v2/q6adm.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sound/soc/msm/qdsp6v2/q6adm.c b/sound/soc/msm/qdsp6v2/q6adm.c index dc7165263316..b40710cf3f45 100644 --- a/sound/soc/msm/qdsp6v2/q6adm.c +++ b/sound/soc/msm/qdsp6v2/q6adm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -2423,8 +2423,8 @@ static int adm_arrange_mch_map_v8( } else if (channel_mode == 6) { ep_payload->dev_channel_mapping[0] = PCM_CHANNEL_FL; ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR; - ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_LFE; - ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_FC; + ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_FC; + ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_LFE; ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LS; ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RS; } else if (channel_mode == 7) { @@ -2432,18 +2432,18 @@ static int adm_arrange_mch_map_v8( ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR; ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_FC; ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_LFE; - ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LB; - ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RB; + ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LS; + ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RS; ep_payload->dev_channel_mapping[6] = PCM_CHANNEL_CS; } else if (channel_mode == 8) { ep_payload->dev_channel_mapping[0] = PCM_CHANNEL_FL; ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR; - ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_LFE; - ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_FC; - ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LS; - ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RS; - ep_payload->dev_channel_mapping[6] = PCM_CHANNEL_LB; - ep_payload->dev_channel_mapping[7] = PCM_CHANNEL_RB; + ep_payload->dev_channel_mapping[2] = PCM_CHANNEL_FC; + ep_payload->dev_channel_mapping[3] = PCM_CHANNEL_LFE; + ep_payload->dev_channel_mapping[4] = PCM_CHANNEL_LB; + ep_payload->dev_channel_mapping[5] = PCM_CHANNEL_RB; + ep_payload->dev_channel_mapping[6] = PCM_CHANNEL_LS; + ep_payload->dev_channel_mapping[7] = PCM_CHANNEL_RS; } else if (channel_mode == 10) { ep_payload->dev_channel_mapping[0] = PCM_CHANNEL_FL; ep_payload->dev_channel_mapping[1] = PCM_CHANNEL_FR; |