Merge "ASoC: msm: Support Channel Mixer Cfg" (39e3389b) · Commits · e / devices / android_kernel_sony_msm8998

include/sound/q6adm-v2.h

+8 −2

Original line number	Original line	Diff line number	Diff line
	/* 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		* 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		* it under the terms of the GNU General Public License version 2 and
	@@ -87,6 +87,11 @@ struct msm_pcm_channel_mixer {
	bool enable;		bool enable;
	int rule;		int rule;
	int channel_weight[ADM_MAX_CHANNELS][ADM_MAX_CHANNELS];		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,		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,		int adm_set_pspd_matrix_params(int port_id, int copp_idx,
	unsigned int session_id,		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,		int adm_set_downmix_params(int port_id, int copp_idx,
	unsigned int session_id, char *params,		unsigned int session_id, char *params,

+737 −4

File changed.

Preview size limit exceeded, changes collapsed.

+735 −4

File changed.

Preview size limit exceeded, changes collapsed.

+4 −3

File changed.

Preview size limit exceeded, changes collapsed.

+236 −2

File changed.

Preview size limit exceeded, changes collapsed.