From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: Vinod Koul <vkoul@kernel.org>, Mark Brown <broonie@kernel.org>,
Takashi Iwai <tiwai@suse.com>
Cc: linux-arm-msm@vger.kernel.org,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Patrick Lai <plai@codeaurora.org>,
Banajit Goswami <bgoswami@codeaurora.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: Re: [RESEND PATCH v2 5/9] ASoC: qcom: q6asm-dai: add support to wma decoder
Date: Fri, 13 Mar 2020 12:15:34 +0000 [thread overview]
Message-ID: <bb1923d8-8374-4e1b-e211-372406196e09@linaro.org> (raw)
In-Reply-To: <20200313101627.1561365-6-vkoul@kernel.org>
On 13/03/2020 10:16, Vinod Koul wrote:
> Qualcomm DSPs also supports the wma decoder, so add support for wma
> decoder and convert the snd_codec_params to qdsp format.
>
> Signed-off-by: Vinod Koul <vkoul@kernel.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
> sound/soc/qcom/qdsp6/q6asm-dai.c | 67 +++++++++++++++++++++++++++++++-
> 1 file changed, 66 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
> index 8f245d03b6f5..53c250778eea 100644
> --- a/sound/soc/qcom/qdsp6/q6asm-dai.c
> +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
> @@ -627,10 +627,13 @@ static int q6asm_dai_compr_set_params(struct snd_compr_stream *stream,
> int dir = stream->direction;
> struct q6asm_dai_data *pdata;
> struct q6asm_flac_cfg flac_cfg;
> + struct q6asm_wma_cfg wma_cfg;
> + unsigned int wma_v9 = 0;
> struct device *dev = c->dev;
> int ret;
> union snd_codec_options *codec_options;
> struct snd_dec_flac *flac;
> + struct snd_dec_wma *wma;
>
> codec_options = &(prtd->codec_param.codec.options);
>
> @@ -692,6 +695,67 @@ static int q6asm_dai_compr_set_params(struct snd_compr_stream *stream,
> return -EIO;
> }
> break;
> +
> + case SND_AUDIOCODEC_WMA:
> + wma = &codec_options->wma_d;
> +
> + memset(&wma_cfg, 0x0, sizeof(struct q6asm_wma_cfg));
> +
> + wma_cfg.sample_rate = params->codec.sample_rate;
> + wma_cfg.num_channels = params->codec.ch_in;
> + wma_cfg.bytes_per_sec = params->codec.bit_rate / 8;
> + wma_cfg.block_align = params->codec.align;
> + wma_cfg.bits_per_sample = prtd->bits_per_sample;
> + wma_cfg.enc_options = wma->encoder_option;
> + wma_cfg.adv_enc_options = wma->adv_encoder_option;
> + wma_cfg.adv_enc_options2 = wma->adv_encoder_option2;
> +
> + if (wma_cfg.num_channels == 1)
> + wma_cfg.channel_mask = 4; /* Mono Center */
> + else if (wma_cfg.num_channels == 2)
> + wma_cfg.channel_mask = 3; /* Stereo FL/FR */
> + else
> + return -EINVAL;
> +
> + /* check the codec profile */
> + switch (params->codec.profile) {
> + case SND_AUDIOPROFILE_WMA9:
> + wma_cfg.fmtag = 0x161;
> + wma_v9 = 1;
> + break;
> +
> + case SND_AUDIOPROFILE_WMA10:
> + wma_cfg.fmtag = 0x166;
> + break;
> +
> + case SND_AUDIOPROFILE_WMA9_PRO:
> + wma_cfg.fmtag = 0x162;
> + break;
> +
> + case SND_AUDIOPROFILE_WMA9_LOSSLESS:
> + wma_cfg.fmtag = 0x163;
> + break;
> +
> + case SND_AUDIOPROFILE_WMA10_LOSSLESS:
> + wma_cfg.fmtag = 0x167;
> + break;
> +
> + default:
> + dev_err(dev, "Unknown WMA profile:%x\n",
> + params->codec.profile);
> + return -EIO;
> + }
> +
> + if (wma_v9)
> + ret = q6asm_stream_media_format_block_wma_v9(
> + prtd->audio_client, &wma_cfg);
> + else
> + ret = q6asm_stream_media_format_block_wma_v10(
> + prtd->audio_client, &wma_cfg);
> + if (ret < 0) {
> + dev_err(dev, "WMA9 CMD failed:%d\n", ret);
> + return -EIO;
> + }
> default:
> break;
> }
> @@ -791,9 +855,10 @@ static int q6asm_dai_compr_get_caps(struct snd_compr_stream *stream,
> 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->num_codecs = 2;
> + caps->num_codecs = 3;
> caps->codecs[0] = SND_AUDIOCODEC_MP3;
> caps->codecs[1] = SND_AUDIOCODEC_FLAC;
> + caps->codecs[2] = SND_AUDIOCODEC_WMA;
>
> return 0;
> }
>
next prev parent reply other threads:[~2020-03-13 12:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 10:16 [RESEND PATCH v2 0/9] ALSA: compress: Add wma, alac and ape support Vinod Koul
2020-03-13 10:16 ` [RESEND PATCH v2 1/9] ALSA: compress: add wma codec profiles Vinod Koul
2020-03-13 10:16 ` [RESEND PATCH v2 2/9] ALSA: compress: Add wma decoder params Vinod Koul
2020-03-13 10:16 ` [RESEND PATCH v2 3/9] ASoC: qcom: q6asm: pass codec profile to q6asm_open_write Vinod Koul
2020-03-13 12:15 ` Srinivas Kandagatla
2020-03-13 10:16 ` [RESEND PATCH v2 4/9] ASoC: qcom: q6asm: add support to wma config Vinod Koul
2020-03-13 12:15 ` Srinivas Kandagatla
2020-03-13 10:16 ` [RESEND PATCH v2 5/9] ASoC: qcom: q6asm-dai: add support to wma decoder Vinod Koul
2020-03-13 12:15 ` Srinivas Kandagatla [this message]
2020-03-13 10:16 ` [RESEND PATCH v2 6/9] ALSA: compress: add alac & ape decoder params Vinod Koul
2020-03-13 10:16 ` [RESEND PATCH v2 7/9] ASoC: qcom: q6asm: add support for alac and ape configs Vinod Koul
2020-03-13 12:15 ` Srinivas Kandagatla
2020-03-13 10:16 ` [RESEND PATCH v2 8/9] ASoC: qcom: q6asm-dai: add support for ALAC and APE decoders Vinod Koul
2020-03-13 12:15 ` Srinivas Kandagatla
2020-03-13 12:40 ` Vinod Koul
2020-03-13 10:16 ` [RESEND PATCH v2 9/9] ALSA: compress: bump the version Vinod Koul
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=bb1923d8-8374-4e1b-e211-372406196e09@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=alsa-devel@alsa-project.org \
--cc=bgoswami@codeaurora.org \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=plai@codeaurora.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).