ASoC: SOF: ipc4-topology: update pipeline_params in process prepare
authorLibin Yang <libin.yang@intel.com>
Thu, 16 Mar 2023 15:11:37 +0000 (17:11 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 17 Mar 2023 13:05:59 +0000 (13:05 +0000)
Some modules may modify the audio format during processing. So, update the
pipeline params based on pin 0's output format during process prepare.

Signed-off-by: Libin Yang <libin.yang@intel.com>
Co-developed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Chao Song <chao.song@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230316151137.7598-7-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/ipc4-topology.c

index 962ec38b70cc2c978b6b438273af50bece0315b5..963ec730381bd30edcb8d973e5ca5f9d75bba300 100644 (file)
@@ -964,6 +964,48 @@ static int sof_ipc4_widget_assign_instance_id(struct snd_sof_dev *sdev,
        return 0;
 }
 
+/* update hw_params based on the audio stream format */
+static int sof_ipc4_update_hw_params(struct snd_sof_dev *sdev, struct snd_pcm_hw_params *params,
+                                    struct sof_ipc4_audio_format *fmt)
+{
+       snd_pcm_format_t snd_fmt;
+       struct snd_interval *i;
+       struct snd_mask *m;
+       int valid_bits = SOF_IPC4_AUDIO_FORMAT_CFG_V_BIT_DEPTH(fmt->fmt_cfg);
+       unsigned int channels, rate;
+
+       switch (valid_bits) {
+       case 16:
+               snd_fmt = SNDRV_PCM_FORMAT_S16_LE;
+               break;
+       case 24:
+               snd_fmt = SNDRV_PCM_FORMAT_S24_LE;
+               break;
+       case 32:
+               snd_fmt = SNDRV_PCM_FORMAT_S32_LE;
+               break;
+       default:
+               dev_err(sdev->dev, "invalid PCM valid_bits %d\n", valid_bits);
+               return -EINVAL;
+       }
+
+       m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
+       snd_mask_none(m);
+       snd_mask_set_format(m, snd_fmt);
+
+       rate = fmt->sampling_frequency;
+       i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
+       i->min = rate;
+       i->max = rate;
+
+       channels = SOF_IPC4_AUDIO_FORMAT_CFG_CHANNELS_COUNT(fmt->fmt_cfg);
+       i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
+       i->min = channels;
+       i->max = channels;
+
+       return 0;
+}
+
 static int sof_ipc4_init_audio_fmt(struct snd_sof_dev *sdev,
                                   struct snd_sof_widget *swidget,
                                   struct sof_ipc4_base_module_cfg *base_config,
@@ -1673,10 +1715,16 @@ static int sof_ipc4_prepare_process_module(struct snd_sof_widget *swidget,
 
        /* copy Pin 0 output format */
        if (available_fmt->num_output_formats && ret < available_fmt->num_output_formats &&
-           !available_fmt->output_pin_fmts[ret].pin_index)
+           !available_fmt->output_pin_fmts[ret].pin_index) {
                memcpy(&process->output_format, &available_fmt->output_pin_fmts[ret].audio_fmt,
                       sizeof(struct sof_ipc4_audio_format));
 
+               /* modify the pipeline params with the pin 0 output format */
+               ret = sof_ipc4_update_hw_params(sdev, pipeline_params, &process->output_format);
+               if (ret)
+                       return ret;
+       }
+
        /* update pipeline memory usage */
        sof_ipc4_update_pipeline_mem_usage(sdev, swidget, &process->base_config);