Skip to content

Commit ef24388

Browse files
ranj063broonie
authored andcommitted
ASoC: SOF: ipc4-topology: Modify pipeline params based on SRC output format
Modify the pipeline_params based on the SRC output format and set the sink_rate in the IPC data. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: https://lore.kernel.org/r/20230821113629.5017-2-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 919a4a9 commit ef24388

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

sound/soc/sof/ipc4-topology.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,10 +1838,10 @@ static int sof_ipc4_prepare_src_module(struct snd_sof_widget *swidget,
18381838
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
18391839
struct sof_ipc4_src *src = swidget->private;
18401840
struct sof_ipc4_available_audio_format *available_fmt = &src->available_fmt;
1841+
struct sof_ipc4_audio_format *out_audio_fmt;
18411842
struct sof_ipc4_audio_format *in_fmt;
18421843
u32 out_ref_rate, out_ref_channels, out_ref_valid_bits;
1843-
struct snd_interval *rate;
1844-
int ret;
1844+
int ret, output_format_index;
18451845

18461846
ret = sof_ipc4_init_input_audio_fmt(sdev, swidget, &src->base_config,
18471847
pipeline_params, available_fmt);
@@ -1853,22 +1853,23 @@ static int sof_ipc4_prepare_src_module(struct snd_sof_widget *swidget,
18531853
out_ref_channels = SOF_IPC4_AUDIO_FORMAT_CFG_CHANNELS_COUNT(in_fmt->fmt_cfg);
18541854
out_ref_valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(in_fmt->fmt_cfg);
18551855

1856-
ret = sof_ipc4_init_output_audio_fmt(sdev, &src->base_config, available_fmt,
1857-
out_ref_rate, out_ref_channels, out_ref_valid_bits);
1858-
if (ret < 0) {
1856+
output_format_index = sof_ipc4_init_output_audio_fmt(sdev, &src->base_config,
1857+
available_fmt, out_ref_rate,
1858+
out_ref_channels, out_ref_valid_bits);
1859+
if (output_format_index < 0) {
18591860
dev_err(sdev->dev, "Failed to initialize output format for %s",
18601861
swidget->widget->name);
1862+
return output_format_index;
18611863
}
18621864

18631865
/* update pipeline memory usage */
18641866
sof_ipc4_update_resource_usage(sdev, swidget, &src->base_config);
18651867

1866-
/* update pipeline_params for sink widgets */
1867-
rate = hw_param_interval(pipeline_params, SNDRV_PCM_HW_PARAM_RATE);
1868-
rate->min = src->sink_rate;
1869-
rate->max = rate->min;
1868+
out_audio_fmt = &available_fmt->output_pin_fmts[output_format_index].audio_fmt;
1869+
src->sink_rate = out_audio_fmt->sampling_frequency;
18701870

1871-
return 0;
1871+
/* update pipeline_params for sink widgets */
1872+
return sof_ipc4_update_hw_params(sdev, pipeline_params, out_audio_fmt);
18721873
}
18731874

18741875
static int

0 commit comments

Comments
 (0)