copier: gain: interface changes for setting gain params

Change type of arguments for gain params setting functions.
DAI data struct is replaced by gain_params. Components other
than DAI can also use copier gain feature (eg. microphone privacy)

Signed-off-by: Michal Bukowski <[email protected]>

Author: mbukowsk

src/audio/copier/copier_dai.c

@@ -229,7 +229,9 @@ static int copier_dai_init(struct comp_dev *dev,
 		}
 		cd->dd[index]->gain_data = gain_data;
 
-		ret = copier_gain_set_params(dev, cd->dd[index]);
+		ret = copier_gain_set_params(dev, cd->dd[index]->gain_data,
+					     GAIN_DEFAULT_FADE_PERIOD,
+					     cd->dd[index]->dai->type);
 		if (ret < 0) {
 			comp_err(dev, "Failed to set gain params!");
 			goto gain_free;

src/audio/copier/copier_gain.c

@@ -15,20 +15,22 @@
 
 LOG_MODULE_DECLARE(copier, CONFIG_SOF_LOG_LEVEL);
 
-int copier_gain_set_params(struct comp_dev *dev, struct dai_data *dd)
+int copier_gain_set_params(struct comp_dev *dev,
+			   struct copier_gain_params *gain_params,
+			   uint32_t fade_period,
+			   enum sof_ipc_dai_type dai_type)
 {
 	struct processing_module *mod = comp_mod(dev);
 	struct copier_data *cd = module_get_private_data(mod);
 	struct ipc4_base_module_cfg *ipc4_cfg = &cd->config.base;
 	uint32_t sampling_freq = ipc4_cfg->audio_fmt.sampling_frequency;
 	uint32_t frames = sampling_freq / dev->pipeline->period;
-	uint32_t fade_period = GAIN_DEFAULT_FADE_PERIOD;
 	int ret;
 
 	/* Set basic gain parameters */
-	copier_gain_set_basic_params(dev, dd, ipc4_cfg);
+	copier_gain_set_basic_params(dev, gain_params, ipc4_cfg);
 
-	switch (dd->dai->type) {
+	switch (dai_type) {
 	case SOF_DAI_INTEL_DMIC:
 		{
 			struct dmic_config_data *dmic_cfg = cd->gtw_cfg;
@@ -43,18 +45,18 @@ int copier_gain_set_params(struct comp_dev *dev, struct dai_data *dd)
 			/* Get fade period from DMIC blob */
 			fade_period = dmic_glb_cfg->ext_global_cfg.fade_in_period;
 			/* Convert and assign silence and fade length values */
-			dd->gain_data->silence_sg_length =
+			gain_params->silence_sg_length =
 				frames * dmic_glb_cfg->ext_global_cfg.silence_period;
-			dd->gain_data->fade_sg_length = frames * fade_period;
+			gain_params->fade_sg_length = frames * fade_period;
 		}
 		break;
 	default:
-		comp_info(dev, "Apply default fade period for dai type %d", dd->dai->type);
+		comp_info(dev, "Apply default fade period for dai type %d", dai_type);
 		break;
 	}
 
 	/* Set fade parameters */
-	ret = copier_gain_set_fade_params(dev, dd, ipc4_cfg, fade_period, frames);
+	ret = copier_gain_set_fade_params(dev, gain_params, ipc4_cfg, fade_period, frames);
 	if (ret)
 		comp_err(dev, "Failed to set fade params");
 
@@ -150,7 +152,10 @@ int copier_gain_dma_control(union ipc4_connector_node_id node, const char *confi
 			break;
 		}
 
-		ret = copier_set_gain(dev, cd->dd[0], gain_data);
+		struct ipc4_copier_module_cfg *copier_cfg = cd->dd[0]->dai_spec_config;
+		const int channels = copier_cfg->base.audio_fmt.channels_count;
+
+		ret = copier_set_gain(dev, cd->dd[0]->gain_data, gain_data, channels);
 		if (ret)
 			comp_err(dev, "Gain DMA control: failed to set gain");
 		return ret;
@@ -159,12 +164,9 @@ int copier_gain_dma_control(union ipc4_connector_node_id node, const char *confi
 	return -ENODEV;
 }
 
-int copier_set_gain(struct comp_dev *dev, struct dai_data *dd,
-		    struct gain_dma_control_data *gain_data)
+int copier_set_gain(struct comp_dev *dev, struct copier_gain_params *gain_params,
+		    struct gain_dma_control_data *gain_data, int channels)
 {
-	struct copier_gain_params *gain_params = dd->gain_data;
-	struct ipc4_copier_module_cfg *copier_cfg = dd->dai_spec_config;
-	const int channels = copier_cfg->base.audio_fmt.channels_count;
 	uint16_t static_gain[MAX_GAIN_COEFFS_CNT];
 	int ret;
 

src/audio/copier/copier_gain.h

@@ -10,6 +10,7 @@
 
 #include <sof/audio/buffer.h>
 #include <ipc4/base_fw.h>
+#include <ipc4/gateway.h>
 #include <ipc/dai.h>
 #if SOF_USE_HIFI(3, COPIER) || SOF_USE_HIFI(4, COPIER) || SOF_USE_HIFI(5, COPIER)
 #include <xtensa/tie/xt_hifi3.h>
@@ -117,10 +118,13 @@ struct gain_dma_control_data {
  * the given device and DAI data.
  *
  * @param dev The pointer to the component device structure.
- * @param dd The pointer to the DAI data structure.
+ * @param gain_params The pointer to gain params structure.
+ * @param fade_period The fade period in milliseconds.
+ * @param dai_type DAI type
  * @return 0 on success, negative error code on failure.
  */
-int copier_gain_set_params(struct comp_dev *dev, struct dai_data *dd);
+int copier_gain_set_params(struct comp_dev *dev, struct copier_gain_params *gain_params,
+			   uint32_t fade_period, enum sof_ipc_dai_type dai_type);
 
 /**
  * @brief Sets the basic gain parameters.
@@ -129,10 +133,10 @@ int copier_gain_set_params(struct comp_dev *dev, struct dai_data *dd);
  * by the given device and DAI data.
  *
  * @param dev The pointer to the component device structure.
- * @param dd The pointer to the DAI data structure.
+ * @param gain_params The pointer to gain params structure.
  * @param ipc4_cfg The pointer to the IPC4 base module config.
  */
-void copier_gain_set_basic_params(struct comp_dev *dev, struct dai_data *dd,
+void copier_gain_set_basic_params(struct comp_dev *dev, struct copier_gain_params *gain_params,
 				  struct ipc4_base_module_cfg *ipc4_cfg);
 
 /**
@@ -142,13 +146,13 @@ void copier_gain_set_basic_params(struct comp_dev *dev, struct dai_data *dd,
  * by the given device and DAI data.
  *
  * @param dev The pointer to the component device structure.
- * @param dd The pointer to the DAI data structure.
+ * @param gain_params The pointer to gain params structure.
  * @param ipc4_cfg The pointer to the IPC4 base module config.
  * @param fade_period The fade period in milliseconds.
  * @param frames The number of frames to fade.
  * @return 0 on success, negative error code on failure.
  */
-int copier_gain_set_fade_params(struct comp_dev *dev, struct dai_data *dd,
+int copier_gain_set_fade_params(struct comp_dev *dev, struct copier_gain_params *gain_params,
 				struct ipc4_base_module_cfg *ipc4_cfg,
 				uint32_t fade_period, uint32_t frames);
 
@@ -209,12 +213,13 @@ enum copier_gain_state copier_gain_eval_state(struct copier_gain_params *gain_pa
  * Sets/modify gain for a copier module in runtime.
  *
  * @param dev The copier device structure.
- * @param dd The DAI data structure.
+ * @param gain_params The pointer to the copier_gain_params structure.
  * @param gain_data The gain control data structure.
+ * @param channels Number of audio channels.
  * @return 0 on success, otherwise a negative error code.
  */
-int copier_set_gain(struct comp_dev *dev, struct dai_data *dd,
-		    struct gain_dma_control_data *gain_data);
+int copier_set_gain(struct comp_dev *dev, struct copier_gain_params *gain_params,
+		    struct gain_dma_control_data *gain_data, int channels);
 
 /**
  * Checks for unity gain mode.

src/audio/copier/copier_generic.c

@@ -60,22 +60,20 @@ int apply_attenuation(struct comp_dev *dev, struct copier_data *cd,
 	}
 }
 
-void copier_gain_set_basic_params(struct comp_dev *dev, struct dai_data *dd,
+void copier_gain_set_basic_params(struct comp_dev *dev, struct copier_gain_params *gain_params,
 				  struct ipc4_base_module_cfg *ipc4_cfg)
 {
-	struct copier_gain_params *gain_params = dd->gain_data;
 
 	gain_params->channels_count = ipc4_cfg->audio_fmt.channels_count;
 
 	for (int i = 0; i < MAX_GAIN_COEFFS_CNT; i++)
 		gain_params->gain_coeffs[i] = UNITY_GAIN_GENERIC;
 }
 
-int copier_gain_set_fade_params(struct comp_dev *dev, struct dai_data *dd,
+int copier_gain_set_fade_params(struct comp_dev *dev, struct copier_gain_params *gain_params,
 				struct ipc4_base_module_cfg *ipc4_cfg,
 				uint32_t fade_period, uint32_t frames)
 {
-	struct copier_gain_params *gain_params = dd->gain_data;
 	uint16_t step_i64_to_i16;
 
 	if (fade_period == GAIN_DEFAULT_FADE_PERIOD) {
@@ -88,6 +86,8 @@ int copier_gain_set_fade_params(struct comp_dev *dev, struct dai_data *dd,
 		/* Special case for GAIN_ZERO_TRANS_MS to support zero fade-in transition time */
 		gain_params->fade_sg_length = 0;
 		return 0;
+	} else {
+		gain_params->fade_sg_length = frames * fade_period;
 	}
 
 	/* High precision step for fade-in calculation, keeps accurate precision */

src/audio/copier/copier_hifi.c

@@ -75,10 +75,9 @@ int apply_attenuation(struct comp_dev *dev, struct copier_data *cd,
 	}
 }
 
-void copier_gain_set_basic_params(struct comp_dev *dev, struct dai_data *dd,
+void copier_gain_set_basic_params(struct comp_dev *dev, struct copier_gain_params *gain_params,
 				  struct ipc4_base_module_cfg *ipc4_cfg)
 {
-	struct copier_gain_params *gain_params = dd->gain_data;
 
 	/* Set default gain coefficients */
 	for (int i = 0; i < ARRAY_SIZE(gain_params->gain_coeffs); ++i)
@@ -91,11 +90,10 @@ void copier_gain_set_basic_params(struct comp_dev *dev, struct dai_data *dd,
 	gain_params->channels_count = ipc4_cfg->audio_fmt.channels_count;
 }
 
-int copier_gain_set_fade_params(struct comp_dev *dev, struct dai_data *dd,
+int copier_gain_set_fade_params(struct comp_dev *dev, struct copier_gain_params *gain_params,
 				struct ipc4_base_module_cfg *ipc4_cfg,
 				uint32_t fade_period, uint32_t frames)
 {
-	struct copier_gain_params *gain_params = dd->gain_data;
 	uint16_t init_gain[MAX_GAIN_COEFFS_CNT];
 	uint16_t step_i64_to_i16;
 	ae_f16 step_f16;
@@ -113,6 +111,8 @@ int copier_gain_set_fade_params(struct comp_dev *dev, struct dai_data *dd,
 		/* Special case for GAIN_ZERO_TRANS_MS to support zero fade in transition time */
 		gain_params->fade_sg_length = 0;
 		return 0;
+	} else {
+		gain_params->fade_sg_length = frames * fade_period;
 	}
 
 	/* High precision step for fade-in calculation, keeps accurate precision */