From a8349a42c75266c40b1060fec0b04025593bafc5 Mon Sep 17 00:00:00 2001 From: Aditya Bavanari Date: Wed, 13 Dec 2017 09:30:15 +0530 Subject: [PATCH] dsp: assign channel mapping to three channel voice Tx devices Assign default channel mapping to three channel voice Tx devices when the topology specific info cal data is NULL. Change-Id: Ic9d572edc1d7de07a2bd5e11d82f875368c35854 Signed-off-by: Aditya Bavanari --- dsp/q6voice.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dsp/q6voice.c b/dsp/q6voice.c index 985e959ab879..428e34cc6abb 100644 --- a/dsp/q6voice.c +++ b/dsp/q6voice.c @@ -36,6 +36,7 @@ #define CMD_STATUS_FAIL 1 #define NUM_CHANNELS_MONO 1 #define NUM_CHANNELS_STEREO 2 +#define NUM_CHANNELS_THREE 3 #define NUM_CHANNELS_QUAD 4 #define CVP_VERSION_2 2 #define GAIN_Q14_FORMAT(a) (a << 14) @@ -8639,6 +8640,11 @@ int voice_set_topology_specific_info(struct voice_data *v, NUM_CHANNELS_STEREO) { v->dev_tx.channel_mapping[0] = PCM_CHANNEL_FL; v->dev_tx.channel_mapping[1] = PCM_CHANNEL_FR; + } else if (v->dev_tx.no_of_channels == + NUM_CHANNELS_THREE) { + v->dev_tx.channel_mapping[0] = PCM_CHANNEL_FL; + v->dev_tx.channel_mapping[1] = PCM_CHANNEL_FR; + v->dev_tx.channel_mapping[2] = PCM_CHANNEL_FC; } else if (v->dev_tx.no_of_channels == NUM_CHANNELS_QUAD) { v->dev_tx.channel_mapping[0] = PCM_CHANNEL_FL;