summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqctecmdr <qctecmdr@localhost>2020-07-30 01:44:59 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2020-07-30 01:44:59 -0700
commit23bae5f1dcc5b6f398b7f9e70c576c57a2c9fe7b (patch)
tree2c64883f808dab0c0043dfdbcb04b3903589d756
parent73a741960f52fa52fb085327a3e6f792fa71863a (diff)
parent9f083ad60abc7ed3087417f35d86691cebf2f1f8 (diff)
downloadmsm-extra-23bae5f1dcc5b6f398b7f9e70c576c57a2c9fe7b.tar.gz
Merge "dsp: fix mute for AptX Adaptive A2DP streaming"
-rw-r--r--dsp/q6afe.c8
-rw-r--r--dsp/q6core.c1
2 files changed, 7 insertions, 2 deletions
diff --git a/dsp/q6afe.c b/dsp/q6afe.c
index 3d76e484..0811d6c1 100644
--- a/dsp/q6afe.c
+++ b/dsp/q6afe.c
@@ -5491,8 +5491,12 @@ static int __afe_port_start(u16 port_id, union afe_port_config *afe_config,
if ((q6core_get_avcs_api_version_per_service(
APRV2_IDS_SERVICE_ID_ADSP_CORE_V) >=
AVCS_API_VERSION_V5)) {
- /* LDAC doesn't require decoder */
- if (codec_format == ENC_CODEC_TYPE_LDAC)
+ /*
+ * LDAC and APTX_ADAPTIVE don't require loading decoder module
+ * Only loading de-packetizer module.
+ */
+ if (codec_format == ENC_CODEC_TYPE_LDAC ||
+ codec_format == ASM_MEDIA_FMT_APTX_ADAPTIVE)
ret = q6afe_load_avcs_modules(1, port_id,
DECODER_CASE, codec_format);
else
diff --git a/dsp/q6core.c b/dsp/q6core.c
index 8e8bedff..392b09de 100644
--- a/dsp/q6core.c
+++ b/dsp/q6core.c
@@ -990,6 +990,7 @@ int32_t q6core_avcs_load_unload_modules(struct avcs_load_unload_modules_payload
else
mod->hdr.opcode = AVCS_CMD_UNLOAD_MODULES;
+ q6core_lcl.adsp_status = 0;
q6core_lcl.avcs_module_resp_received = 0;
ret = apr_send_pkt(q6core_lcl.core_handle_q,
(uint32_t *)mod);