From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> To: broonie@kernel.org Cc: vkoul@kernel.org, perex@perex.cz, tiwai@suse.com, lgirdwood@gmail.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, ckeepax@opensource.cirrus.com, Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Subject: [RFC PATCH v2 6/6] ASoC: q6asm-dai: add support to set_codec_params Date: Tue, 21 Jul 2020 18:00:07 +0100 [thread overview] Message-ID: <20200721170007.4554-7-srinivas.kandagatla@linaro.org> (raw) In-Reply-To: <20200721170007.4554-1-srinivas.kandagatla@linaro.org> Make use of new set_codec_params callback to allow decoder switching during gapless playback. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- 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; + + return ret; +} + static int q6asm_dai_compr_set_params(struct snd_soc_component *component, struct snd_compr_stream *stream, struct snd_compr_params *params) @@ -1144,6 +1175,7 @@ static int q6asm_dai_compr_get_caps(struct snd_soc_component *component, caps->max_fragment_size = COMPR_PLAYBACK_MAX_FRAGMENT_SIZE; caps->min_fragments = COMPR_PLAYBACK_MIN_NUM_FRAGMENTS; caps->max_fragments = COMPR_PLAYBACK_MAX_NUM_FRAGMENTS; + caps->flags = SND_COMPR_CAP_FLAGS_DSP_CAN_SWITCH_DECODER; caps->num_codecs = 5; caps->codecs[0] = SND_AUDIOCODEC_MP3; caps->codecs[1] = SND_AUDIOCODEC_FLAC; @@ -1173,6 +1205,7 @@ static struct snd_compress_ops q6asm_dai_compress_ops = { .open = q6asm_dai_compr_open, .free = q6asm_dai_compr_free, .set_params = q6asm_dai_compr_set_params, + .set_codec_params = q6asm_dai_compr_set_codec_params, .set_metadata = q6asm_dai_compr_set_metadata, .pointer = q6asm_dai_compr_pointer, .trigger = q6asm_dai_compr_trigger, -- 2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> To: broonie@kernel.org Cc: alsa-devel@alsa-project.org, ckeepax@opensource.cirrus.com, tiwai@suse.com, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, vkoul@kernel.org, Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Subject: [RFC PATCH v2 6/6] ASoC: q6asm-dai: add support to set_codec_params Date: Tue, 21 Jul 2020 18:00:07 +0100 [thread overview] Message-ID: <20200721170007.4554-7-srinivas.kandagatla@linaro.org> (raw) In-Reply-To: <20200721170007.4554-1-srinivas.kandagatla@linaro.org> Make use of new set_codec_params callback to allow decoder switching during gapless playback. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- 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; + + return ret; +} + static int q6asm_dai_compr_set_params(struct snd_soc_component *component, struct snd_compr_stream *stream, struct snd_compr_params *params) @@ -1144,6 +1175,7 @@ static int q6asm_dai_compr_get_caps(struct snd_soc_component *component, caps->max_fragment_size = COMPR_PLAYBACK_MAX_FRAGMENT_SIZE; caps->min_fragments = COMPR_PLAYBACK_MIN_NUM_FRAGMENTS; caps->max_fragments = COMPR_PLAYBACK_MAX_NUM_FRAGMENTS; + caps->flags = SND_COMPR_CAP_FLAGS_DSP_CAN_SWITCH_DECODER; caps->num_codecs = 5; caps->codecs[0] = SND_AUDIOCODEC_MP3; caps->codecs[1] = SND_AUDIOCODEC_FLAC; @@ -1173,6 +1205,7 @@ static struct snd_compress_ops q6asm_dai_compress_ops = { .open = q6asm_dai_compr_open, .free = q6asm_dai_compr_free, .set_params = q6asm_dai_compr_set_params, + .set_codec_params = q6asm_dai_compr_set_codec_params, .set_metadata = q6asm_dai_compr_set_metadata, .pointer = q6asm_dai_compr_pointer, .trigger = q6asm_dai_compr_trigger, -- 2.21.0
next prev parent reply other threads:[~2020-07-21 17:03 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-21 17:00 [RFC PATCH v2 0/6] ALSA: compress: add support to change codec profile in gapless playback Srinivas Kandagatla 2020-07-21 17:00 ` Srinivas Kandagatla 2020-07-21 17:00 ` [RFC PATCH v2 1/6] ALSA: compress: move codec parameter check to a function Srinivas Kandagatla 2020-07-21 17:00 ` Srinivas Kandagatla 2020-07-21 19:56 ` Pierre-Louis Bossart 2020-07-21 19:56 ` Pierre-Louis Bossart 2020-07-21 17:00 ` [RFC PATCH v2 2/6] ALSA: compress: add new ioctl for setting codec parameters Srinivas Kandagatla 2020-07-21 17:00 ` Srinivas Kandagatla 2020-07-21 20:05 ` Pierre-Louis Bossart 2020-07-21 20:05 ` Pierre-Louis Bossart 2020-07-22 8:59 ` Srinivas Kandagatla 2020-07-22 8:59 ` Srinivas Kandagatla 2020-07-22 15:36 ` Pierre-Louis Bossart 2020-07-22 15:36 ` Pierre-Louis Bossart 2020-07-23 4:47 ` Vinod Koul 2020-07-23 4:47 ` Vinod Koul 2020-07-23 13:17 ` Pierre-Louis Bossart 2020-07-23 13:17 ` Pierre-Louis Bossart 2020-07-21 17:00 ` [RFC PATCH v2 3/6] ALSA: compress: add flags to snd_compr_caps to expose dsp caps Srinivas Kandagatla 2020-07-21 17:00 ` Srinivas Kandagatla 2020-07-21 17:00 ` [RFC PATCH v2 4/6] ASoC: compress: add snd_soc_dai_compr_set_codec_params() Srinivas Kandagatla 2020-07-21 17:00 ` Srinivas Kandagatla 2020-07-21 17:00 ` [RFC PATCH v2 5/6] ALSA: compress: bump the version Srinivas Kandagatla 2020-07-21 17:00 ` Srinivas Kandagatla 2020-07-21 17:00 ` Srinivas Kandagatla [this message] 2020-07-21 17:00 ` [RFC PATCH v2 6/6] ASoC: q6asm-dai: add support to set_codec_params Srinivas Kandagatla 2020-07-21 20:09 ` Pierre-Louis Bossart 2020-07-21 20:09 ` Pierre-Louis Bossart 2020-07-22 8:59 ` Srinivas Kandagatla 2020-07-22 8:59 ` Srinivas Kandagatla 2020-07-22 14:04 ` Daniel Baluta 2020-07-22 14:04 ` Daniel Baluta 2020-07-23 12:38 ` [RFC PATCH v2 0/6] ALSA: compress: add support to change codec profile in gapless playback Takashi Iwai 2020-07-23 12:38 ` Takashi Iwai 2020-07-23 13:05 ` Vinod Koul 2020-07-23 13:05 ` Vinod Koul 2020-07-23 13:17 ` Takashi Iwai 2020-07-23 13:17 ` Takashi Iwai 2020-07-23 15:56 ` Vinod Koul 2020-07-23 15:56 ` Vinod Koul 2020-07-23 20:33 ` Takashi Iwai 2020-07-23 20:33 ` Takashi Iwai 2020-08-06 11:08 ` Vinod Koul 2020-08-06 11:08 ` Vinod Koul 2020-08-06 16:28 ` Takashi Iwai 2020-08-06 16:28 ` Takashi Iwai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200721170007.4554-7-srinivas.kandagatla@linaro.org \ --to=srinivas.kandagatla@linaro.org \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=ckeepax@opensource.cirrus.com \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=tiwai@suse.com \ --cc=vkoul@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.