* Re: [PATCH V4 3/3] ASoC: fsl_asrc: Unify the supported input and output rate
@ 2019-04-20 7:23 S.j. Wang
2019-04-20 7:29 ` Nicolin Chen
0 siblings, 1 reply; 4+ messages in thread
From: S.j. Wang @ 2019-04-20 7:23 UTC (permalink / raw)
To: Nicolin Chen
Cc: alsa-devel@alsa-project.org, timur@kernel.org,
Xiubo.Lee@gmail.com, festevam@gmail.com,
linux-kernel@vger.kernel.org, broonie@kernel.org,
linuxppc-dev@lists.ozlabs.org
Hi.
>
> On Fri, Apr 19, 2019 at 10:23:56AM +0000, S.j. Wang wrote:
> > Unify the supported input and output rate, add the 12kHz/24kHz/128kHz
> > to the support list
> >
> > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> > ---
> > sound/soc/fsl/fsl_asrc.c | 32 +++++++++++++++++++-------------
> > 1 file changed, 19 insertions(+), 13 deletions(-)
> >
> > diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index
> > 2c4bbc3499db..0d06e738264a 100644
> > --- a/sound/soc/fsl/fsl_asrc.c
> > +++ b/sound/soc/fsl/fsl_asrc.c
> > @@ -27,13 +27,14 @@
> > dev_dbg(&asrc_priv->pdev->dev, "Pair %c: " fmt, 'A' + index,
> > ##__VA_ARGS__)
> >
> > /* Corresponding to process_option */ -static int
> > supported_input_rate[] = {
> > - 5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000, 88200,
> > - 96000, 176400, 192000,
> > +static unsigned int supported_asrc_rate[] = {
> > + 5512, 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000,
> > + 64000, 88200, 96000, 128000, 176400, 192000,
> > };
> >
> > -static int supported_asrc_rate[] = {
> > - 8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000, 88200, 96000,
> 176400, 192000,
> > +static struct snd_pcm_hw_constraint_list fsl_asrc_rate_constraints = {
> > + .count = ARRAY_SIZE(supported_asrc_rate),
> > + .list = supported_asrc_rate,
> > };
> >
> > /**
> > @@ -293,11 +294,11 @@ static int fsl_asrc_config_pair(struct
> fsl_asrc_pair *pair)
> > ideal = config->inclk == INCLK_NONE;
> >
> > /* Validate input and output sample rates */
> > - for (in = 0; in < ARRAY_SIZE(supported_input_rate); in++)
> > - if (inrate == supported_input_rate[in])
> > + for (in = 0; in < ARRAY_SIZE(supported_asrc_rate); in++)
> > + if (inrate == supported_asrc_rate[in])
> > break;
>
> Not sure if we still need it upon having hw_constraint. Maybe m2m needs it?
Yes.
Best regards
Wang shengjiu
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH V4 3/3] ASoC: fsl_asrc: Unify the supported input and output rate 2019-04-20 7:23 [PATCH V4 3/3] ASoC: fsl_asrc: Unify the supported input and output rate S.j. Wang @ 2019-04-20 7:29 ` Nicolin Chen 0 siblings, 0 replies; 4+ messages in thread From: Nicolin Chen @ 2019-04-20 7:29 UTC (permalink / raw) To: S.j. Wang Cc: alsa-devel@alsa-project.org, timur@kernel.org, Xiubo.Lee@gmail.com, festevam@gmail.com, linux-kernel@vger.kernel.org, broonie@kernel.org, linuxppc-dev@lists.ozlabs.org On Sat, Apr 20, 2019 at 07:23:59AM +0000, S.j. Wang wrote: > > > /* Validate input and output sample rates */ > > > - for (in = 0; in < ARRAY_SIZE(supported_input_rate); in++) > > > - if (inrate == supported_input_rate[in]) > > > + for (in = 0; in < ARRAY_SIZE(supported_asrc_rate); in++) > > > + if (inrate == supported_asrc_rate[in]) > > > break; > > > > Not sure if we still need it upon having hw_constraint. Maybe m2m needs it? > Yes. OK. Then we can leave it there. Thanks ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH V4 0/3] Support more sample rate in asrc @ 2019-04-19 10:23 S.j. Wang 2019-04-19 10:23 ` [PATCH V4 3/3] ASoC: fsl_asrc: Unify the supported input and output rate S.j. Wang 0 siblings, 1 reply; 4+ messages in thread From: S.j. Wang @ 2019-04-19 10:23 UTC (permalink / raw) To: timur@kernel.org, nicoleotsuka@gmail.com, Xiubo.Lee@gmail.com, festevam@gmail.com, broonie@kernel.org, alsa-devel@alsa-project.org Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Support more sample rate in asrc Shengjiu Wang (3): ASoC: fsl_asrc: Fix the issue about unsupported rate ASoC: fsl_asrc: replace the process_option table with function ASoC: fsl_asrc: Unify the supported input and output rate Changes in v4 - add patch to Fix the [8kHz, 30kHz] open set issue. Changes in v3 - remove FSL_ASRC_RATES - refine fsl_asrc_sel_proc according to comments Changes in v2 - add more comments in code - add commit "Unify the supported input and output rate" sound/soc/fsl/fsl_asrc.c | 113 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 77 insertions(+), 36 deletions(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH V4 3/3] ASoC: fsl_asrc: Unify the supported input and output rate 2019-04-19 10:23 [PATCH V4 0/3] Support more sample rate in asrc S.j. Wang @ 2019-04-19 10:23 ` S.j. Wang 2019-04-19 18:28 ` Nicolin Chen 0 siblings, 1 reply; 4+ messages in thread From: S.j. Wang @ 2019-04-19 10:23 UTC (permalink / raw) To: timur@kernel.org, nicoleotsuka@gmail.com, Xiubo.Lee@gmail.com, festevam@gmail.com, broonie@kernel.org, alsa-devel@alsa-project.org Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Unify the supported input and output rate, add the 12kHz/24kHz/128kHz to the support list Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> --- sound/soc/fsl/fsl_asrc.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 2c4bbc3499db..0d06e738264a 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -27,13 +27,14 @@ dev_dbg(&asrc_priv->pdev->dev, "Pair %c: " fmt, 'A' + index, ##__VA_ARGS__) /* Corresponding to process_option */ -static int supported_input_rate[] = { - 5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000, 88200, - 96000, 176400, 192000, +static unsigned int supported_asrc_rate[] = { + 5512, 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000, + 64000, 88200, 96000, 128000, 176400, 192000, }; -static int supported_asrc_rate[] = { - 8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000, 88200, 96000, 176400, 192000, +static struct snd_pcm_hw_constraint_list fsl_asrc_rate_constraints = { + .count = ARRAY_SIZE(supported_asrc_rate), + .list = supported_asrc_rate, }; /** @@ -293,11 +294,11 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair) ideal = config->inclk == INCLK_NONE; /* Validate input and output sample rates */ - for (in = 0; in < ARRAY_SIZE(supported_input_rate); in++) - if (inrate == supported_input_rate[in]) + for (in = 0; in < ARRAY_SIZE(supported_asrc_rate); in++) + if (inrate == supported_asrc_rate[in]) break; - if (in == ARRAY_SIZE(supported_input_rate)) { + if (in == ARRAY_SIZE(supported_asrc_rate)) { pair_err("unsupported input sample rate: %dHz\n", inrate); return -EINVAL; } @@ -311,7 +312,7 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair) return -EINVAL; } - if ((outrate >= 8000 && outrate <= 30000) && + if ((outrate >= 5512 && outrate <= 30000) && (outrate > 24 * inrate || inrate > 8 * outrate)) { pair_err("exceed supported ratio range (1/24, 8) for inrate/outrate: %d/%d\n", inrate, outrate); @@ -490,7 +491,9 @@ static int fsl_asrc_dai_startup(struct snd_pcm_substream *substream, snd_pcm_hw_constraint_step(substream->runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, 2); - return 0; + + return snd_pcm_hw_constraint_list(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, &fsl_asrc_rate_constraints); } static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream, @@ -603,7 +606,6 @@ static int fsl_asrc_dai_probe(struct snd_soc_dai *dai) return 0; } -#define FSL_ASRC_RATES SNDRV_PCM_RATE_8000_192000 #define FSL_ASRC_FORMATS (SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S20_3LE) @@ -614,14 +616,18 @@ static int fsl_asrc_dai_probe(struct snd_soc_dai *dai) .stream_name = "ASRC-Playback", .channels_min = 1, .channels_max = 10, - .rates = FSL_ASRC_RATES, + .rate_min = 5512, + .rate_max = 192000, + .rates = SNDRV_PCM_RATE_KNOT, .formats = FSL_ASRC_FORMATS, }, .capture = { .stream_name = "ASRC-Capture", .channels_min = 1, .channels_max = 10, - .rates = FSL_ASRC_RATES, + .rate_min = 5512, + .rate_max = 192000, + .rates = SNDRV_PCM_RATE_KNOT, .formats = FSL_ASRC_FORMATS, }, .ops = &fsl_asrc_dai_ops, -- 1.9.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V4 3/3] ASoC: fsl_asrc: Unify the supported input and output rate 2019-04-19 10:23 ` [PATCH V4 3/3] ASoC: fsl_asrc: Unify the supported input and output rate S.j. Wang @ 2019-04-19 18:28 ` Nicolin Chen 0 siblings, 0 replies; 4+ messages in thread From: Nicolin Chen @ 2019-04-19 18:28 UTC (permalink / raw) To: S.j. Wang Cc: alsa-devel@alsa-project.org, timur@kernel.org, Xiubo.Lee@gmail.com, festevam@gmail.com, linux-kernel@vger.kernel.org, broonie@kernel.org, linuxppc-dev@lists.ozlabs.org On Fri, Apr 19, 2019 at 10:23:56AM +0000, S.j. Wang wrote: > Unify the supported input and output rate, add the > 12kHz/24kHz/128kHz to the support list > > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> > --- > sound/soc/fsl/fsl_asrc.c | 32 +++++++++++++++++++------------- > 1 file changed, 19 insertions(+), 13 deletions(-) > > diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c > index 2c4bbc3499db..0d06e738264a 100644 > --- a/sound/soc/fsl/fsl_asrc.c > +++ b/sound/soc/fsl/fsl_asrc.c > @@ -27,13 +27,14 @@ > dev_dbg(&asrc_priv->pdev->dev, "Pair %c: " fmt, 'A' + index, ##__VA_ARGS__) > > /* Corresponding to process_option */ > -static int supported_input_rate[] = { > - 5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000, 88200, > - 96000, 176400, 192000, > +static unsigned int supported_asrc_rate[] = { > + 5512, 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000, > + 64000, 88200, 96000, 128000, 176400, 192000, > }; > > -static int supported_asrc_rate[] = { > - 8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000, 88200, 96000, 176400, 192000, > +static struct snd_pcm_hw_constraint_list fsl_asrc_rate_constraints = { > + .count = ARRAY_SIZE(supported_asrc_rate), > + .list = supported_asrc_rate, > }; > > /** > @@ -293,11 +294,11 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair) > ideal = config->inclk == INCLK_NONE; > > /* Validate input and output sample rates */ > - for (in = 0; in < ARRAY_SIZE(supported_input_rate); in++) > - if (inrate == supported_input_rate[in]) > + for (in = 0; in < ARRAY_SIZE(supported_asrc_rate); in++) > + if (inrate == supported_asrc_rate[in]) > break; Not sure if we still need it upon having hw_constraint. Maybe m2m needs it? ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-04-20 7:31 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-04-20 7:23 [PATCH V4 3/3] ASoC: fsl_asrc: Unify the supported input and output rate S.j. Wang 2019-04-20 7:29 ` Nicolin Chen -- strict thread matches above, loose matches on Subject: below -- 2019-04-19 10:23 [PATCH V4 0/3] Support more sample rate in asrc S.j. Wang 2019-04-19 10:23 ` [PATCH V4 3/3] ASoC: fsl_asrc: Unify the supported input and output rate S.j. Wang 2019-04-19 18:28 ` Nicolin Chen
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).