Audio: Selector: Add support for multiple up/down-mix profiles

This patch extends the struct ipc4_selector_coeffs_config. The
first 16-bit reserved field is split into to 8-bit field
for source and sink channels count.

The configuration is changed to array of the previous structs
instead of single. When preparing for stream the array is checked
for matching number of channels for source and sink and if found
the coefficients for the channels counts is selected into use.

The change avoids the need for user space to update the
configuration in runtime if the blob used for initialization
contains all the needed channels up/down-mix profiles.

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

Author: singalsu

src/audio/selector/selector.c

@@ -572,9 +572,9 @@ static void build_config(struct comp_data *cd, struct module_config *cfg)
 	cd->config.out_channels_count = out_fmt->channels_count;
 
 	/* Build default coefficient array (unity Q10 on diagonal, i.e. pass-through mode) */
-	memset(&cd->coeffs_config, 0, sizeof(cd->coeffs_config));
+	memset(cd->coeffs_config, 0, sizeof(*cd->coeffs_config));
 	for (i = 0; i < MIN(SEL_SOURCE_CHANNELS_MAX, SEL_SINK_CHANNELS_MAX); i++)
-		cd->coeffs_config.coeffs[i][i] = 1 << 10;
+		cd->coeffs_config->coeffs[i][i] = 1 << 10;
 }
 
 static int selector_init(struct processing_module *mod)
@@ -620,6 +620,18 @@ static int selector_init(struct processing_module *mod)
 	cd->sel_ipc4_cfg.init_payload_fmt = payload_fmt;
 	md->private = cd;
 
+	/* Allocate space for max number of configurations. */
+	cd->multi_coeffs_config_size =
+		SEL_MAX_NUM_CONFIGS * sizeof(struct ipc4_selector_coeffs_config);
+	cd->multi_coeffs_config = mod_zalloc(mod, cd->multi_coeffs_config_size);
+	if (!cd->multi_coeffs_config) {
+		mod_free(mod, cd);
+		return -ENOMEM;
+	}
+
+	/* Default configuration is set to first configuration */
+	cd->coeffs_config = &cd->multi_coeffs_config[0];
+
 	if (payload_fmt == IPC4_SEL_INIT_PAYLOAD_BASE_WITH_EXT) {
 		size_t size = sizeof(struct sof_selector_ipc4_pin_config);
 
@@ -733,6 +745,7 @@ static int selector_free(struct processing_module *mod)
 
 	comp_dbg(mod->dev, "entry");
 
+	mod_free(mod, cd->multi_coeffs_config);
 	mod_free(mod, cd);
 
 	return 0;
@@ -769,12 +782,26 @@ static int selector_set_config(struct processing_module *mod, uint32_t config_id
 			       size_t response_size)
 {
 	struct comp_data *cd = module_get_private_data(mod);
+	int n;
 
 	if (config_id == IPC4_SELECTOR_COEFFS_CONFIG_ID) {
-		if (data_offset_size != sizeof(cd->coeffs_config))
+		if (data_offset_size > cd->multi_coeffs_config_size) {
+			comp_err(mod->dev, "The configuration blob is too large");
+			return -EINVAL;
+		}
+
+		/* The size must be N times the coefficient vectors size of one channels
+		 * up/down mix profile.
+		 */
+		n = data_offset_size / sizeof(struct ipc4_selector_coeffs_config);
+		if (data_offset_size != n * sizeof(struct ipc4_selector_coeffs_config)) {
+			comp_err(mod->dev, "Invalid configuration size.");
 			return -EINVAL;
+		}
 
-		memcpy_s(&cd->coeffs_config, sizeof(cd->coeffs_config), fragment, data_offset_size);
+		memcpy_s(cd->multi_coeffs_config, cd->multi_coeffs_config_size,
+			 fragment, data_offset_size);
+		cd->num_configs = n;
 		return 0;
 	}
 
@@ -825,7 +852,10 @@ static int selector_prepare(struct processing_module *mod,
 	struct comp_dev *dev = mod->dev;
 	struct comp_buffer *sinkb, *sourceb;
 	size_t sink_size;
+	unsigned int source_channels;
+	unsigned int sink_channels;
 	int ret;
+	int i;
 
 	comp_dbg(dev, "entry");
 
@@ -855,9 +885,9 @@ static int selector_prepare(struct processing_module *mod,
 	 * proper number of channels [1] for selector to actually
 	 * reduce channel count between source and sink
 	 */
-	comp_info(dev, "source sink channel = %u %u",
-		  audio_stream_get_channels(&sourceb->stream),
-		  audio_stream_get_channels(&sinkb->stream));
+	source_channels = audio_stream_get_channels(&sourceb->stream);
+	sink_channels = audio_stream_get_channels(&sinkb->stream);
+	comp_dbg(dev, "source sink channel = %u %u", source_channels, sink_channels);
 
 	sink_size = audio_stream_get_size(&sinkb->stream);
 
@@ -891,6 +921,28 @@ static int selector_prepare(struct processing_module *mod,
 		return -EINVAL;
 	}
 
+	/* The first config for coefficients always exists, originating from configuration blob
+	 * or default values (1.0) from set_selector_params().
+	 */
+	cd->coeffs_config = cd->multi_coeffs_config;
+	if (cd->num_configs > 1) {
+		/* Use a 8ch pass-through blob if same number of channels */
+		if (source_channels == sink_channels) {
+			source_channels = 8;
+			sink_channels = 8;
+		}
+
+		for (i = 0; i < cd->num_configs; i++) {
+			if (cd->multi_coeffs_config[i].source_channels_count == source_channels &&
+			    cd->multi_coeffs_config[i].sink_channels_count == sink_channels) {
+				comp_info(dev, "Using coefficients for %d to %d channels.",
+					  source_channels, sink_channels);
+				cd->coeffs_config = &cd->multi_coeffs_config[i];
+				break;
+			}
+		}
+	}
+
 	return 0;
 }
 

src/audio/selector/selector_generic.c

@@ -228,7 +228,7 @@ static void sel_s16le(struct processing_module *mod, struct input_stream_buffer
 		n = MIN(n, nmax);
 		for (i = 0; i < n; i++) {
 			process_frame_s16le(dest, n_chan_sink, src, n_chan_source,
-					    &cd->coeffs_config);
+					    cd->coeffs_config);
 			src += audio_stream_get_channels(source);
 			dest += audio_stream_get_channels(sink);
 		}
@@ -301,7 +301,7 @@ static void sel_s24le(struct processing_module *mod, struct input_stream_buffer
 		n = MIN(n, nmax);
 		for (i = 0; i < n; i++) {
 			process_frame_s24le(dest, n_chan_sink, src, n_chan_source,
-					    &cd->coeffs_config);
+					    cd->coeffs_config);
 			src += audio_stream_get_channels(source);
 			dest += audio_stream_get_channels(sink);
 		}
@@ -372,7 +372,7 @@ static void sel_s32le(struct processing_module *mod, struct input_stream_buffer
 		n = MIN(n, nmax);
 		for (i = 0; i < n; i++) {
 			process_frame_s32le(dest, n_chan_sink, src, n_chan_source,
-					    &cd->coeffs_config);
+					    cd->coeffs_config);
 			src += audio_stream_get_channels(source);
 			dest += audio_stream_get_channels(sink);
 		}

src/include/sof/audio/selector.h

@@ -43,6 +43,9 @@ struct comp_dev;
 /** \brief Maximum supported channel count on output. */
 #define SEL_SINK_CHANNELS_MAX   8
 
+/** \brief Maximum number of configurations in the blob received with set_config() */
+#define SEL_MAX_NUM_CONFIGS	8
+
 #define SEL_NUM_IN_PIN_FMTS	1
 #define SEL_NUM_OUT_PIN_FMTS	1
 
@@ -60,7 +63,8 @@ enum ipc4_selector_config_id {
 
 /** \brief IPC4 mixing coefficients configuration. */
 struct ipc4_selector_coeffs_config {
-	uint16_t rsvd0;	/**< Unused field, keeps the structure aligned with common layout */
+	uint8_t source_channels_count; /**< source channels count when num_configs != 0 */
+	uint8_t sink_channels_count; /**< sink channels count when num_configs != 0 */
 	uint16_t rsvd1;	/**< Unused field, keeps the structure aligned with common layout */
 
 	/** Mixing coefficients in Q10 fixed point format */
@@ -108,7 +112,9 @@ typedef void (*sel_func)(struct comp_dev *dev, struct audio_stream *sink,
 struct comp_data {
 #if CONFIG_IPC_MAJOR_4
 	struct sof_selector_ipc4_config sel_ipc4_cfg;
-	struct ipc4_selector_coeffs_config coeffs_config;
+	struct ipc4_selector_coeffs_config *coeffs_config;
+	struct ipc4_selector_coeffs_config *multi_coeffs_config;
+	size_t multi_coeffs_config_size;
 #endif
 
 	uint32_t source_period_bytes;	/**< source number of period bytes */
@@ -117,6 +123,7 @@ struct comp_data {
 	enum sof_ipc_frame sink_format;		/**< sink frame format */
 	struct sof_sel_config config;	/**< component configuration data */
 	sel_func sel_func;	/**< channel selector processing function */
+	int num_configs;	/**< two or more if multiple mix blobs received */
 };
 
 /** \brief Selector processing functions map. */