Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c404960 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dsp: adm: change sample rate for FLUENCE_EF module"

parents f1fb31da 1529b55b

dsp/q6adm.c

+7 −1
Original line number Diff line number Diff line
@@ -2784,8 +2784,14 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, 


	if ((topology == VPM_TX_SM_ECNS_V2_COPP_TOPOLOGY) ||

	    (topology == VPM_TX_DM_FLUENCE_COPP_TOPOLOGY) ||

	    (topology == VPM_TX_DM_RFECNS_COPP_TOPOLOGY))

	    (topology == VPM_TX_DM_RFECNS_COPP_TOPOLOGY)||

	    (topology == VPM_TX_DM_FLUENCE_EF_COPP_TOPOLOGY)) {

		if ((rate != ADM_CMD_COPP_OPEN_SAMPLE_RATE_8K) &&

		    (rate != ADM_CMD_COPP_OPEN_SAMPLE_RATE_16K) &&

		    (rate != ADM_CMD_COPP_OPEN_SAMPLE_RATE_32K) &&

		    (rate != ADM_CMD_COPP_OPEN_SAMPLE_RATE_48K))

		rate = 16000;

	}



	if (topology == VPM_TX_VOICE_SMECNS_V2_COPP_TOPOLOGY)

		channel_mode = 1;

include/dsp/apr_audio-v2.h

+4 −0
Original line number Diff line number Diff line
@@ -254,6 +254,9 @@ struct adm_cmd_matrix_map_routings_v5 { 
/* Sample rate is 16000 Hz.*/

#define ADM_CMD_COPP_OPEN_SAMPLE_RATE_16K 16000



/* Sample rate is 32000 Hz.*/

#define ADM_CMD_COPP_OPEN_SAMPLE_RATE_32K 32000



/* Sample rate is 48000 Hz.*/

#define ADM_CMD_COPP_OPEN_SAMPLE_RATE_48K 48000
@@ -5082,6 +5085,7 @@ struct afe_param_id_lpass_core_shared_clk_cfg { 
#define VPM_TX_DM_RFECNS_COPP_TOPOLOGY			0x00010F86

#define ADM_CMD_COPP_OPEN_TOPOLOGY_ID_DTS_HPX		0x10015002

#define ADM_CMD_COPP_OPEN_TOPOLOGY_ID_AUDIOSPHERE	0x10028000

#define VPM_TX_DM_FLUENCE_EF_COPP_TOPOLOGY		0x10000005



/* Memory map regions command payload used by the

 * #ASM_CMD_SHARED_MEM_MAP_REGIONS ,#ADM_CMD_SHARED_MEM_MAP_REGIONS