Audio: Selector: Add support for multiple up/down-mix profiles by singalsu · Pull Request #10613 · thesofproject/sof

singalsu · 2026-03-10T12:47:56Z

No description provided.

singalsu · 2026-03-10T12:51:31Z

WIP - I seem to have still incorrect channels order assumption for 5.1 format.

Update - it wasn't wrong, the cplay in tinycompress wasn't parsing the extended wav header that is used with more than two channels: alsa-project/tinycompress#32

src/audio/selector/selector.c

Copilot

Pull request overview

This PR extends the IPC4 selector/micsel coefficient blob format and firmware handling to support receiving multiple up/down-mix profiles in a single set_config() call, and adds a new combined topology blob intended for playback endpoint decoder-offload conversions.

Changes:

Add support in selector IPC4 path for multiple coefficient configurations and runtime selection by (source_channels, sink_channels), plus a “passthrough copy” fast-path.
Update the Octave blob-generation script to emit packed headers per profile and to generate a combined multi-profile blob.
Replace/remove legacy single-purpose downmix blob config files and add a new stereo_endpoint_playback_updownmix.conf multi-profile blob.

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
tools/topology/topology2/include/components/micsel/stereo_endpoint_playback_updownmix.conf	Adds a new multi-profile selector_config blob for playback endpoint conversions.
tools/topology/topology2/include/components/micsel/downmix_71_to_stereo.conf	Removes legacy single-profile blob (no-LFE variant).
tools/topology/topology2/include/components/micsel/downmix_71_to_mono.conf	Removes legacy single-profile blob (no-LFE variant).
tools/topology/topology2/include/components/micsel/downmix_51_to_stereo.conf	Removes legacy single-profile blob (no-LFE variant).
tools/topology/topology2/include/components/micsel/downmix_51_to_mono.conf	Removes legacy single-profile blob (no-LFE variant).
src/include/sof/audio/selector.h	Extends coeff config header layout and adds constants for Q10 unity and max config count.
src/audio/selector/tune/sof_selector_blobs.m	Generates packed profile headers and a combined multi-profile blob.
src/audio/selector/selector_generic.c	Updates processing calls to use a pointer to the selected coefficient config.
src/audio/selector/selector.c	Allocates storage for multiple configs, parses multi-config blobs, selects profile at prepare time, and adds passthrough fast-path.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

src/audio/selector/selector.c

src/audio/selector/tune/sof_selector_blobs.m

src/audio/selector/selector.c

Copilot

Pull request overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 7 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

src/audio/selector/selector.c

src/include/sof/audio/selector.h

src/audio/selector/tune/sof_selector_blobs.m

src/audio/selector/selector.c

Copilot

Pull request overview

Copilot reviewed 9 out of 9 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-12T13:08:04Z

src/audio/selector/selector.c

+		cd->num_configs = n;
+		return memcpy_s(cd->multi_coeffs_config, cd->multi_coeffs_config_size,
+				fragment, data_offset_size);
 	}


selector_set_config() updates cd->num_configs and overwrites cd->multi_coeffs_config, but it does not reset/reselect cd->coeffs_config (or recompute cd->passthrough). If set_config() is called after prepare() (or if the new blob contains fewer profiles than before), cd->coeffs_config can keep pointing at an out-of-range/stale profile and the selector may use incorrect coefficients or an incorrect passthrough decision until the next prepare(). Consider resetting cd->coeffs_config to &cd->multi_coeffs_config[0] after the copy and, when the module is already initialized/prepared, re-running the coefficient selection + passthrough detection for the currently connected source/sink channel counts.

I wasn't planning on-the-run re-configuration but it can be added. Need to synchronize the changes to begin of copy() with a duplicate coeffs_config instead of a pointer to blob.

Copilot · 2026-03-12T13:08:05Z

src/audio/selector/selector.c

+	if (cd->num_configs > 1) {
+		found = selector_config_array_search(cd, source_channels, sink_channels);
+		if (!found &&  source_channels == sink_channels) {
+			/* The pass-through mix is defined for the max channels count (8) */
+			source_channels = SEL_SOURCE_CHANNELS_MAX;
+			sink_channels = SEL_SINK_CHANNELS_MAX;
+			found = selector_config_array_search(cd, source_channels, sink_channels);
+		}


In selector_find_coefficients(), the fallback path overwrites source_channels/sink_channels with the hard-coded max (8) before logging and passthrough detection. This can make logs misleading for e.g. a 2->2 stream and also makes same-channel operation depend on an explicit 8->8 profile being present in multi-profile blobs. Consider preserving the original channel counts for logging/passthrough checks and treating “no matching profile + source==sink” as a valid passthrough case (use the default unity matrix) instead of requiring an 8->8 entry.

Copilot · 2026-03-12T13:08:05Z

src/audio/selector/selector.c

-		if (data_offset_size != sizeof(cd->coeffs_config))
+		if (data_offset_size > cd->multi_coeffs_config_size ||
+		    pos != MODULE_CFG_FRAGMENT_SINGLE) {
+			comp_err(mod->dev, "Failure with size %d pos %d", data_offset_size, pos);


comp_err() uses %d for data_offset_size (a uint32_t) which can print negative values for large sizes. Use %u (and consider casting pos to int if you want to keep %d).

Suggested change

comp_err(mod->dev, "Failure with size %d pos %d", data_offset_size, pos);

comp_err(mod->dev, "Failure with size %u pos %d", data_offset_size, pos);

Copilot · 2026-03-12T13:08:05Z

src/audio/selector/tune/sof_selector_blobs.m

-	sel.rsvd1 = 0;
+	sel.ch_count = [8 8]; % Number of channels
+	sel.ch_config = [IPC4_CHANNEL_CONFIG_7_POINT_1 IPC4_CHANNEL_CONFIG_7_POINT_1];
+	sel.ch_out = 8;


sel.ch_out is assigned but never used. Removing it would avoid confusion about whether output channel count is expected to be part of the packed blob format.

Suggested change

sel.ch_out = 8;

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>

This patch modifies the configuration blobs build script sof_selector_blobs.m to create one blob that contains several of them for the purpose to up or down-mix DSP offloaded decoder output. The blob uses the reserved fields of selector configuration to describe source and sink channel counts and channel config values. The exported blob is "stereo_endpoint_playback_updownmix.conf". The single configuration blobs continue to be with the reserved fields as zeros. The .conf blobs may be removed later when other topologies are modified to not use them. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

This patch adds for micsel component configuration blob "stereo_endpoint_playback_updownmix.conf". It contains the needed up-mix and down-mix coefficients to handle playback of mono, 5.1 and 7.1 channels into stereo endpoint. The old configuration blobs with five and seven channels without LFE channel are removed. Despite the file names with "51" and "71" the blobs are not suitable for 6ch or 8ch handling. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

lyakh reviewed Mar 11, 2026

View reviewed changes

src/audio/selector/selector.c Outdated Show resolved Hide resolved

singalsu force-pushed the selector_multiblob_support branch from 7dcf377 to b2d33be Compare March 11, 2026 15:47

singalsu marked this pull request as ready for review March 11, 2026 15:51

singalsu requested a review from ranj063 as a code owner March 11, 2026 15:51

Copilot AI review requested due to automatic review settings March 11, 2026 15:51

singalsu requested review from dbaluta, jsarha, kv2019i, lbetlej, lgirdwood, mmaka1, plbossart and tlissows as code owners March 11, 2026 15:51

Copilot started reviewing on behalf of singalsu March 11, 2026 15:52 View session

Copilot AI reviewed Mar 11, 2026

View reviewed changes

singalsu force-pushed the selector_multiblob_support branch from b2d33be to c7c5e41 Compare March 11, 2026 17:19

singalsu requested a review from Copilot March 11, 2026 17:22

Copilot started reviewing on behalf of singalsu March 11, 2026 17:25 View session

Copilot AI reviewed Mar 11, 2026

View reviewed changes

singalsu force-pushed the selector_multiblob_support branch from c7c5e41 to 9ec813f Compare March 12, 2026 12:50

singalsu requested a review from Copilot March 12, 2026 13:00

Copilot started reviewing on behalf of singalsu March 12, 2026 13:00 View session

Copilot AI reviewed Mar 12, 2026

View reviewed changes

singalsu mentioned this pull request Mar 12, 2026

Tools: Topology: Add selector to compress playback pipeline #10618

Draft

singalsu added 3 commits March 13, 2026 12:43

singalsu force-pushed the selector_multiblob_support branch from 9ec813f to 5ee027d Compare March 13, 2026 10:45

	comp_err(mod->dev, "Failure with size %d pos %d", data_offset_size, pos);
	comp_err(mod->dev, "Failure with size %u pos %d", data_offset_size, pos);

Conversation

singalsu commented Mar 10, 2026

Uh oh!

singalsu commented Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

singalsu Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

singalsu commented Mar 10, 2026 •

edited

Loading