Audio: Up_down_mixer: Handle Linux driver init

In Linux the up_down_mixer is initialized as process component
type without mix definitions. This change adds to init() a
default pass-through configuration with same input and output
format.

The up/down mixing configuration can be updated with bytes
control. The mixing configuration is re-initialized in
added prepare() step.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

Author: singalsu

src/audio/up_down_mixer/up_down_mixer.c

@@ -335,12 +335,16 @@ static int up_down_mixer_free(struct processing_module *mod)
 
 static int up_down_mixer_init(struct processing_module *mod)
 {
+	struct up_down_mixer_config default_config;
 	struct module_config *dst = &mod->priv.cfg;
-	const struct ipc4_up_down_mixer_module_cfg *up_down_mixer = dst->init_data;
+	const struct ipc4_up_down_mixer_module_cfg *up_down_mixer_init = dst->init_data;
+	const struct up_down_mixer_config *up_down_mixer = &up_down_mixer_init->config;
 	struct module_data *mod_data = &mod->priv;
 	struct comp_dev *dev = mod->dev;
 	struct up_down_mixer_data *cd;
+	size_t min_size;
 	int ret;
+	int i;
 
 	cd = rzalloc(SOF_MEM_ZONE_RUNTIME, 0, SOF_MEM_CAPS_RAM, sizeof(*cd));
 	if (!cd) {
@@ -357,6 +361,32 @@ static int up_down_mixer_init(struct processing_module *mod)
 		goto err;
 	}
 
+	comp_info(dev, "nb_input_pins = %d, nb_output_pins = %d",
+		  dst->nb_input_pins, dst->nb_output_pins);
+
+	min_size = sizeof(struct ipc4_base_module_cfg);
+	if (dst->nb_input_pins > 0 && dst->nb_output_pins > 0)
+		min_size += ipc4_calc_base_module_cfg_ext_size(dst->nb_input_pins,
+							       dst->nb_output_pins);
+	comp_info(dev, "ipc_config_size = %d, min_size = %d",
+		  dev->ipc_config.ipc_config_size, min_size);
+
+	if (dev->ipc_config.ipc_config_size > min_size) {
+		cd->has_init_mix_configuration = true;
+		comp_info(dev, "init data contains up_down_mixer configuration");
+		comp_info(dev, "out_channel_config = %d", up_down_mixer->out_channel_config);
+		comp_info(dev, "coefficients_select = %d", up_down_mixer->coefficients_select);
+		comp_info(dev, "channel_map = %d", up_down_mixer->channel_map);
+		for (i = 0; i < UP_DOWN_MIX_COEFFS_LENGTH; i++)
+			comp_info(dev, "coef[%d] = %d", i, up_down_mixer->coefficients[i]);
+	} else {
+		cd->has_init_mix_configuration = false;
+		default_config.out_channel_config = up_down_mixer_init->base_cfg.audio_fmt.ch_cfg;
+		default_config.coefficients_select = DEFAULT_COEFFICIENTS;
+		up_down_mixer = &default_config;
+		comp_info(dev, "no up_down_mixer configuration in init, using default");
+	}
+
 	switch (up_down_mixer->coefficients_select) {
 	case DEFAULT_COEFFICIENTS:
 		cd->out_channel_map = create_channel_map(up_down_mixer->out_channel_config);

src/audio/up_down_mixer/up_down_mixer.h

@@ -14,6 +14,7 @@
 #include <ipc/stream.h>
 #include <ipc4/module.h>
 #include <ipc4/base-config.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -142,6 +143,8 @@ struct up_down_mixer_data {
 	/** In/out internal buffers */
 	int32_t *buf_in;
 	int32_t *buf_out;
+
+	bool has_init_mix_configuration;
 };
 
 /**

src/audio/up_down_mixer/up_down_mixer_ipc4.h

@@ -28,9 +28,7 @@ enum up_down_mix_coeff_select {
 #define UP_DOWN_MIX_COEFFS_LENGTH       8
 #define IPC4_UP_DOWN_MIXER_MODULE_OUTPUT_PINS_COUNT	1
 
-struct ipc4_up_down_mixer_module_cfg {
-	struct ipc4_base_module_cfg base_cfg;
-
+struct up_down_mixer_config {
 	/*
 	 * Output Channel Configuration.
 	 * Together with audio_fmt.channel_config determines module conversion ratio.
@@ -64,6 +62,11 @@ struct ipc4_up_down_mixer_module_cfg {
 	 * channel decoding.
 	 */
 	channel_map channel_map;
+};
+
+struct ipc4_up_down_mixer_module_cfg {
+	struct ipc4_base_module_cfg base_cfg;
+	struct up_down_mixer_config config;
 } __packed __aligned(8);
 
 #endif /* __SOF_IPC4_UP_DOWN_MIXER_H__ */