From 597695312d391eaceaf7e6b7f523a0f606796c80 Mon Sep 17 00:00:00 2001 From: Surendar Karka Date: Mon, 5 Aug 2019 16:02:32 +0530 Subject: [PATCH] asoc: add support for custom channel map In a stream we need to add support for downmixed stereo channel along with the left and right channels. Add custom channel map to support downmixed stereo channels. Change-Id: Icb7fa226a6f07ee4f7d00b8f55fe578c27719c86 Signed-off-by: Surendar Karka --- asoc/msm-compress-q6-v2.c | 4 ++-- include/dsp/apr_audio-v2.h | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/asoc/msm-compress-q6-v2.c b/asoc/msm-compress-q6-v2.c index 4f58f351b352..75b217f13bea 100644 --- a/asoc/msm-compress-q6-v2.c +++ b/asoc/msm-compress-q6-v2.c @@ -4171,8 +4171,8 @@ static int msm_compr_channel_map_info(struct snd_kcontrol *kcontrol, uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->count = PCM_FORMAT_MAX_NUM_CHANNEL_V8; uinfo->value.integer.min = 0; - /* See PCM_CHANNEL_UNUSED=47 in apr_audio-v2.h */ - uinfo->value.integer.max = 47; + /* See PCM_MAX_CHANNEL_MAP in apr_audio-v2.h */ + uinfo->value.integer.max = PCM_MAX_CHANNEL_MAP; return 0; } diff --git a/include/dsp/apr_audio-v2.h b/include/dsp/apr_audio-v2.h index cfac0659b5a3..22557b7cda0d 100644 --- a/include/dsp/apr_audio-v2.h +++ b/include/dsp/apr_audio-v2.h @@ -5669,6 +5669,24 @@ struct asm_softvolume_params { /* Mark unused channel. */ #define PCM_CHANNEL_UNUSED 47 +#define PCM_CUSTOM_CHANNEL_MAP_1 48 +#define PCM_CUSTOM_CHANNEL_MAP_2 49 +#define PCM_CUSTOM_CHANNEL_MAP_3 50 +#define PCM_CUSTOM_CHANNEL_MAP_4 51 +#define PCM_CUSTOM_CHANNEL_MAP_5 52 +#define PCM_CUSTOM_CHANNEL_MAP_6 53 +#define PCM_CUSTOM_CHANNEL_MAP_7 54 +#define PCM_CUSTOM_CHANNEL_MAP_8 55 +#define PCM_CUSTOM_CHANNEL_MAP_9 56 +#define PCM_CUSTOM_CHANNEL_MAP_10 57 +#define PCM_CUSTOM_CHANNEL_MAP_11 58 +#define PCM_CUSTOM_CHANNEL_MAP_12 59 +#define PCM_CUSTOM_CHANNEL_MAP_13 60 +#define PCM_CUSTOM_CHANNEL_MAP_14 61 +#define PCM_CUSTOM_CHANNEL_MAP_15 62 +#define PCM_CUSTOM_CHANNEL_MAP_16 63 +#define PCM_MAX_CHANNEL_MAP 63 + /* Max valid channel map index */ #define PCM_MAX_CHMAP_ID PCM_CHANNEL_RSD