From: Nicolin Chen <nicoleotsuka@gmail.com>
To: Shengjiu Wang <shengjiu.wang@nxp.com>
Cc: alsa-devel@alsa-project.org, timur@kernel.org,
Xiubo.Lee@gmail.com, linuxppc-dev@lists.ozlabs.org,
tiwai@suse.com, lgirdwood@gmail.com, broonie@kernel.org,
festevam@gmail.com, linux-kernel@vger.kernel.org
Subject: Re: [alsa-devel] [PATCH 1/3] ASoC: fsl_asrc: Use in(out)put_format instead of in(out)put_word_width
Date: Mon, 9 Sep 2019 13:01:57 -0700 [thread overview]
Message-ID: <20190909200156.GB10344@Asurada-Nvidia.nvidia.com> (raw)
In-Reply-To: <65e96ca15afd4a282b122f3ea8b13642cf4614c7.1568025083.git.shengjiu.wang@nxp.com>
On Mon, Sep 09, 2019 at 06:33:19PM -0400, Shengjiu Wang wrote:
> snd_pcm_format_t is more formal than enum asrc_word_width, which has
> two property, width and physical width, which is more accurate than
> enum asrc_word_width. So it is better to use in(out)put_format
> instead of in(out)put_word_width.
Hmm...I don't really see the benefit of using snd_pcm_format_t
here...I mean, I know it's a generic one, and would understand
if we use it as a param for a common API. But this patch merely
packs the "width" by intentionally using this snd_pcm_format_t
and then adds another translation to unpack it.. I feel it's a
bit overcomplicated. Or am I missing something?
And I feel it's not necessary to use ALSA common format in our
own "struct asrc_config" since it is more IP/register specific.
Thanks
Nicolin
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
> sound/soc/fsl/fsl_asrc.c | 56 +++++++++++++++++++++++++++-------------
> sound/soc/fsl/fsl_asrc.h | 4 +--
> 2 files changed, 40 insertions(+), 20 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
> index cfa40ef6b1ca..4d3804a1ea55 100644
> --- a/sound/soc/fsl/fsl_asrc.c
> +++ b/sound/soc/fsl/fsl_asrc.c
> @@ -265,6 +265,8 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair)
> struct asrc_config *config = pair->config;
> struct fsl_asrc *asrc_priv = pair->asrc_priv;
> enum asrc_pair_index index = pair->index;
> + enum asrc_word_width input_word_width;
> + enum asrc_word_width output_word_width;
> u32 inrate, outrate, indiv, outdiv;
> u32 clk_index[2], div[2];
> int in, out, channels;
> @@ -283,9 +285,32 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair)
> return -EINVAL;
> }
>
> - /* Validate output width */
> - if (config->output_word_width == ASRC_WIDTH_8_BIT) {
> - pair_err("does not support 8bit width output\n");
> + switch (snd_pcm_format_width(config->input_format)) {
> + case 8:
> + input_word_width = ASRC_WIDTH_8_BIT;
> + break;
> + case 16:
> + input_word_width = ASRC_WIDTH_16_BIT;
> + break;
> + case 24:
> + input_word_width = ASRC_WIDTH_24_BIT;
> + break;
> + default:
> + pair_err("does not support this input format, %d\n",
> + config->input_format);
> + return -EINVAL;
> + }
> +
> + switch (snd_pcm_format_width(config->output_format)) {
> + case 16:
> + output_word_width = ASRC_WIDTH_16_BIT;
> + break;
> + case 24:
> + output_word_width = ASRC_WIDTH_24_BIT;
> + break;
> + default:
> + pair_err("does not support this output format, %d\n",
> + config->output_format);
> return -EINVAL;
> }
>
> @@ -383,8 +408,8 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair)
> /* Implement word_width configurations */
> regmap_update_bits(asrc_priv->regmap, REG_ASRMCR1(index),
> ASRMCR1i_OW16_MASK | ASRMCR1i_IWD_MASK,
> - ASRMCR1i_OW16(config->output_word_width) |
> - ASRMCR1i_IWD(config->input_word_width));
> + ASRMCR1i_OW16(output_word_width) |
> + ASRMCR1i_IWD(input_word_width));
>
> /* Enable BUFFER STALL */
> regmap_update_bits(asrc_priv->regmap, REG_ASRMCR(index),
> @@ -497,13 +522,13 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream,
> struct snd_soc_dai *dai)
> {
> struct fsl_asrc *asrc_priv = snd_soc_dai_get_drvdata(dai);
> - int width = params_width(params);
> struct snd_pcm_runtime *runtime = substream->runtime;
> struct fsl_asrc_pair *pair = runtime->private_data;
> unsigned int channels = params_channels(params);
> unsigned int rate = params_rate(params);
> struct asrc_config config;
> - int word_width, ret;
> + snd_pcm_format_t format;
> + int ret;
>
> ret = fsl_asrc_request_pair(channels, pair);
> if (ret) {
> @@ -513,15 +538,10 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream,
>
> pair->config = &config;
>
> - if (width == 16)
> - width = ASRC_WIDTH_16_BIT;
> - else
> - width = ASRC_WIDTH_24_BIT;
> -
> if (asrc_priv->asrc_width == 16)
> - word_width = ASRC_WIDTH_16_BIT;
> + format = SNDRV_PCM_FORMAT_S16_LE;
> else
> - word_width = ASRC_WIDTH_24_BIT;
> + format = SNDRV_PCM_FORMAT_S24_LE;
>
> config.pair = pair->index;
> config.channel_num = channels;
> @@ -529,13 +549,13 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream,
> config.outclk = OUTCLK_ASRCK1_CLK;
>
> if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
> - config.input_word_width = width;
> - config.output_word_width = word_width;
> + config.input_format = params_format(params);
> + config.output_format = format;
> config.input_sample_rate = rate;
> config.output_sample_rate = asrc_priv->asrc_rate;
> } else {
> - config.input_word_width = word_width;
> - config.output_word_width = width;
> + config.input_format = format;
> + config.output_format = params_format(params);
> config.input_sample_rate = asrc_priv->asrc_rate;
> config.output_sample_rate = rate;
> }
> diff --git a/sound/soc/fsl/fsl_asrc.h b/sound/soc/fsl/fsl_asrc.h
> index c60075112570..38af485bdd22 100644
> --- a/sound/soc/fsl/fsl_asrc.h
> +++ b/sound/soc/fsl/fsl_asrc.h
> @@ -342,8 +342,8 @@ struct asrc_config {
> unsigned int dma_buffer_size;
> unsigned int input_sample_rate;
> unsigned int output_sample_rate;
> - enum asrc_word_width input_word_width;
> - enum asrc_word_width output_word_width;
> + snd_pcm_format_t input_format;
> + snd_pcm_format_t output_format;
> enum asrc_inclk inclk;
> enum asrc_outclk outclk;
> };
> --
> 2.21.0
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-09-09 20:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-09 22:33 [alsa-devel] [PATCH 0/3] update supported sample format Shengjiu Wang
2019-09-09 22:33 ` [alsa-devel] [PATCH 1/3] ASoC: fsl_asrc: Use in(out)put_format instead of in(out)put_word_width Shengjiu Wang
2019-09-09 20:01 ` Nicolin Chen [this message]
2019-09-10 2:22 ` [alsa-devel] [EXT] " S.j. Wang
2019-09-12 23:21 ` Nicolin Chen
2019-09-12 23:21 ` [alsa-devel] " Nicolin Chen
2019-09-09 22:33 ` [alsa-devel] [PATCH 2/3] ASoC: fsl_asrc: update supported sample format Shengjiu Wang
2019-09-09 20:19 ` Nicolin Chen
2019-09-09 22:33 ` [alsa-devel] [PATCH 3/3] ASoC: fsl_asrc: Fix error with S24_3LE format bitstream in i.MX8 Shengjiu Wang
2019-09-10 1:52 ` Nicolin Chen
2019-09-10 2:24 ` [alsa-devel] [EXT] " S.j. Wang
2019-09-11 11:08 ` [alsa-devel] " Mark Brown
2019-09-12 23:53 ` Nicolin Chen
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=20190909200156.GB10344@Asurada-Nvidia.nvidia.com \
--to=nicoleotsuka@gmail.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=festevam@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=shengjiu.wang@nxp.com \
--cc=timur@kernel.org \
--cc=tiwai@suse.com \
/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).