diff options
| author | qctecmdr <qctecmdr@localhost> | 2019-10-28 21:43:36 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-10-28 21:43:36 -0700 |
| commit | 45bdf83f509e7041991d1d1cf06e2e0cdd558c99 (patch) | |
| tree | 585bd1f6368e5ea8ee2c9abc308d0022995a08b6 | |
| parent | b36fdff8301b9c04a76739e7cf647115a347d7f8 (diff) | |
| parent | bf53fd2f3b164884e6cd0ec0d4bb7bd7ad0db6af (diff) | |
| download | msm-extra-45bdf83f509e7041991d1d1cf06e2e0cdd558c99.tar.gz | |
Merge "dsp: adm: use default rate for unsupported sample rates"
| -rw-r--r-- | dsp/q6adm.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dsp/q6adm.c b/dsp/q6adm.c index ef3b0c21..559fb812 100644 --- a/dsp/q6adm.c +++ b/dsp/q6adm.c @@ -2902,14 +2902,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) { |