Re: [RFC PATCH v2 6/6] ASoC: q6asm-dai: add support to set_codec_params

From: Srinivas Kandagatla
Date: Wed Jul 22 2020 - 04:59:56 EST




Thanks Pierre for quick review.

On 21/07/2020 21:09, Pierre-Louis Bossart wrote:


On 7/21/20 12:00 PM, Srinivas Kandagatla wrote:
Make use of new set_codec_params callback to allow decoder switching
during gapless playback.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
---
 sound/soc/qcom/qdsp6/q6asm-dai.c | 33 ++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
index b5c719682919..a8cfb1996614 100644
--- a/sound/soc/qcom/qdsp6/q6asm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
@@ -876,6 +876,37 @@ static int __q6asm_dai_compr_set_codec_params(struct snd_soc_component *componen
ÂÂÂÂÂ return 0;
 }
+static int q6asm_dai_compr_set_codec_params(struct snd_soc_component *component,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ struct snd_compr_stream *stream,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ struct snd_codec *codec)
+{
+ÂÂÂ struct snd_compr_runtime *runtime = stream->runtime;
+ÂÂÂ struct q6asm_dai_rtd *prtd = runtime->private_data;
+ÂÂÂ int ret;
+
+ÂÂÂ ret = q6asm_open_write(prtd->audio_client, prtd->next_track_stream_id,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ codec->id, codec->profile, prtd->bits_per_sample,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ true);
+ÂÂÂ if (ret < 0) {
+ÂÂÂÂÂÂÂ pr_err("q6asm_open_write failed\n");
+ÂÂÂÂÂÂÂ return ret;
+ÂÂÂ }
+
+ÂÂÂ ret = __q6asm_dai_compr_set_codec_params(component, stream, codec,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ prtd->next_track_stream_id);
+ÂÂÂ if (ret < 0) {
+ÂÂÂÂÂÂÂ pr_err("q6asm_open_write failed\n");
+ÂÂÂÂÂÂÂ return ret;
+ÂÂÂ }
+
+ÂÂÂ ret = q6asm_stream_remove_initial_silence(prtd->audio_client,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ prtd->next_track_stream_id,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ prtd->initial_samples_drop);
+ÂÂÂ prtd->next_track_stream_id = 0;

same comment as in the other patchset, the stream_id toggles between 1 and 2, it's not clear to me what 0 means.

Valid stream ids start from 1. to achieve gapless we toggle between 1 and 2.

--srini



off-by-one bug or feature?