Audio: Selector: Add support for multiple up/down-mix profiles#10613
Audio: Selector: Add support for multiple up/down-mix profiles#10613singalsu wants to merge 3 commits intothesofproject:mainfrom
Conversation
|
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 |
singalsu
force-pushed
the
selector_multiblob_support
branch
from
7dcf377 to
b2d33be
Compare
There was a problem hiding this comment.
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.confmulti-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.
singalsu
force-pushed
the
selector_multiblob_support
branch
from
b2d33be to
c7c5e41
Compare
There was a problem hiding this comment.
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.
singalsu
force-pushed
the
selector_multiblob_support
branch
from
c7c5e41 to
9ec813f
Compare
There was a problem hiding this comment.
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.
singalsu
force-pushed
the
selector_multiblob_support
branch
from
9ec813f to
5ee027d
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 8 out of 8 changed files in this pull request and generated 3 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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>
singalsu
force-pushed
the
selector_multiblob_support
branch
from
5ee027d to
1e9d6fc
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 8 out of 8 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
No description provided.