From af3faf2ae3db2bfeb0cc40a269da93887f23907c Mon Sep 17 00:00:00 2001 From: Yunfei Zhang Date: Sun, 15 Sep 2019 15:50:39 +0800 Subject: [PATCH] dsp: adm: use default rate for unsupported sample rates Some ECNS topologies can't support sample rate of 48KHZ, reset it to 16KHZ for such use cases. Change-Id: I5d0457feb2e74929546746fd4b184f2d7e065fbb Signed-off-by: Yunfei Zhang --- dsp/q6adm.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dsp/q6adm.c b/dsp/q6adm.c index 6dbbbc0000d9..b161df90aec7 100644 --- a/dsp/q6adm.c +++ b/dsp/q6adm.c @@ -3044,14 +3044,19 @@ 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_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; + rate = 16000; + } + if ((topology == VPM_TX_DM_FLUENCE_COPP_TOPOLOGY) || + (topology == VPM_TX_DM_RFECNS_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 = 16000; } if (topology == FFECNS_TOPOLOGY) {