diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-06 20:57:54 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-06 20:57:54 -0800 |
| commit | 39e3389b7973d0675d1d25c701885254b4b6cbc0 (patch) | |
| tree | 8546a500c4a7b9fee5c291b729c98dca9fa8ec16 /include | |
| parent | 83efda84fc680d6ca3cafff28901191171a0dc59 (diff) | |
| parent | 444917149379dd56b69163f83547e0cea5b041de (diff) | |
Merge "ASoC: msm: Support Channel Mixer Cfg"
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/q6adm-v2.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/sound/q6adm-v2.h b/include/sound/q6adm-v2.h index 84087de3d4d8..e3cfb107c973 100644 --- a/include/sound/q6adm-v2.h +++ b/include/sound/q6adm-v2.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2018, 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 @@ -87,6 +87,11 @@ struct msm_pcm_channel_mixer { bool enable; int rule; int channel_weight[ADM_MAX_CHANNELS][ADM_MAX_CHANNELS]; + int port_idx; + int input_channel; + uint16_t in_ch_map[ADM_MAX_CHANNELS]; + uint16_t out_ch_map[ADM_MAX_CHANNELS]; + int override_cfg; }; int srs_trumedia_open(int port_id, int copp_idx, __s32 srs_tech_id, @@ -162,7 +167,8 @@ int adm_get_indexes_from_copp_id(int copp_id, int *port_idx, int *copp_idx); int adm_set_pspd_matrix_params(int port_id, int copp_idx, unsigned int session_id, - char *params, uint32_t params_length); + char *params, uint32_t params_length, + int session_type); int adm_set_downmix_params(int port_id, int copp_idx, unsigned int session_id, char *params, |