Skip to content

[Do not review] Audio: Up_down_mixer: Handle Linux driver init #10021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
singalsu wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

[Do not review] Audio: Up_down_mixer: Handle Linux driver init #10021

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
48ff7be
Tools: Rimage: Add Up_down_mixer to TGL and TGL-H .toml
singalsu May 16, 2025
fd8931c
[do not merge] App: Boards: Enable Up_down_mixer kconfig for cAVS2.5
singalsu May 21, 2025
bbaff37
Tools: Testbench: Add up_down_mixer component
singalsu May 16, 2025
7808ff3
Tools: Topology: Add benchmark tplg for up_down_mixer
singalsu May 16, 2025
aad225a
Audio: Up_down_mixer: Handle Linux driver init
singalsu May 19, 2025
33cba9f
Audio: Up_down_mixer: Process with circular wrap
singalsu May 19, 2025
1b83b77
Audio: Up_down_mix: Split HiFi3 and generic version
singalsu May 19, 2025
7380bfb
Audio: Up_down_mix: Replace simple stubs with generic C versions
singalsu May 20, 2025
8e8caec
[do not merge] Audio: Up_down_mixer: Force generic C version build
singalsu May 20, 2025
c7e2e07
[do not merge] Tools: Testbench: No O3 for debugger
singalsu May 20, 2025
d096510
[do not merge] Audio: Up_down_mixer: Add traces to debug operation in…
singalsu May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/audio/up_down_mixer/up_down_mixer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ static int set_downmix_coefficients(struct processing_module *mod,
struct comp_dev *dev = mod->dev;
int ret;

comp_info(dev, "set_downmix_coefficients()");
Copy link
Copy Markdown
Member

@lgirdwood lgirdwood May 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw, we can do func now in Zephyr.


if (cd->downmix_coefficients) {
ret = memcpy_s(&custom_coeffs, sizeof(custom_coeffs), downmix_coefficients,
sizeof(int32_t) * UP_DOWN_MIX_COEFFS_LENGTH);
Expand Down Expand Up @@ -110,6 +112,8 @@ static int set_downmix_coefficients(struct processing_module *mod,
static up_down_mixer_routine select_mix_out_stereo(struct comp_dev *dev,
const struct ipc4_audio_format *format)
{
comp_info(dev, "select_mix_out_stereo()");

if (format->depth == IPC4_DEPTH_16BIT) {
switch (format->ch_cfg) {
case IPC4_CHANNEL_CONFIG_MONO:
Expand Down Expand Up @@ -175,6 +179,8 @@ static up_down_mixer_routine select_mix_out_stereo(struct comp_dev *dev,
static up_down_mixer_routine select_mix_out_mono(struct comp_dev *dev,
const struct ipc4_audio_format *format)
{
comp_info(dev, "select_mix_out_mono(");

if (format->depth == IPC4_DEPTH_16BIT) {
switch (format->ch_cfg) {
case IPC4_CHANNEL_CONFIG_STEREO:
Expand Down Expand Up @@ -226,6 +232,8 @@ static up_down_mixer_routine select_mix_out_mono(struct comp_dev *dev,
static up_down_mixer_routine select_mix_out_5_1(struct comp_dev *dev,
const struct ipc4_audio_format *format)
{
comp_info(dev, "select_mix_out_5_1()");

if (format->depth == IPC4_DEPTH_16BIT) {
switch (format->ch_cfg) {
case IPC4_CHANNEL_CONFIG_MONO:
Expand Down Expand Up @@ -265,6 +273,8 @@ static int init_mix(struct processing_module *mod,
struct up_down_mixer_data *cd = module_get_private_data(mod);
struct comp_dev *dev = mod->dev;

comp_info(dev, "init_mix()");

if (!format)
return -EINVAL;

Expand Down Expand Up @@ -326,6 +336,8 @@ static int up_down_mixer_free(struct processing_module *mod)
{
struct up_down_mixer_data *cd = module_get_private_data(mod);

comp_info(mod->dev, "up_down_mixer_free()");

rfree(cd->buf_in);
rfree(cd->buf_out);
rfree(cd);
Expand Down Expand Up @@ -405,23 +417,31 @@ static int up_down_mixer_init(struct processing_module *mod)
switch (up_down_mixer->coefficients_select) {
case DEFAULT_COEFFICIENTS:
cd->out_channel_map = create_channel_map(up_down_mixer->out_channel_config);
comp_info(dev, "c1 out_channel map = 0x%08x", cd->out_channel_map);
ret = init_mix(mod, &mod->priv.cfg.base_cfg.audio_fmt,
up_down_mixer->out_channel_config, NULL);
comp_info(dev, "c1 init_mix() done");
break;
case CUSTOM_COEFFICIENTS:
cd->out_channel_map = create_channel_map(up_down_mixer->out_channel_config);
comp_info(dev, "c2 out_channel map = 0x%08x", cd->out_channel_map);
ret = init_mix(mod, &mod->priv.cfg.base_cfg.audio_fmt,
up_down_mixer->out_channel_config, up_down_mixer->coefficients);
comp_info(dev, "c2 init_mix() done");
break;
case DEFAULT_COEFFICIENTS_WITH_CHANNEL_MAP:
cd->out_channel_map = up_down_mixer->channel_map;
comp_info(dev, "c3 out_channel map = 0x%08x", cd->out_channel_map);
ret = init_mix(mod, &mod->priv.cfg.base_cfg.audio_fmt,
up_down_mixer->out_channel_config, NULL);
comp_info(dev, "c3 init_mix() done");
break;
case CUSTOM_COEFFICIENTS_WITH_CHANNEL_MAP:
cd->out_channel_map = up_down_mixer->channel_map;
comp_info(dev, "c4 out_channel map = 0x%08x", cd->out_channel_map);
ret = init_mix(mod, &mod->priv.cfg.base_cfg.audio_fmt,
up_down_mixer->out_channel_config, up_down_mixer->coefficients);
comp_info(dev, "c4 init_mix() done");
break;
default:
comp_err(dev, "up_down_mixer_init(): unsupported coefficient type");
Expand All @@ -434,9 +454,11 @@ static int up_down_mixer_init(struct processing_module *mod)
goto err;
}

comp_info(dev, "up_down_mixer_init() ready");
return 0;

err:
comp_err(dev, "up_down_mixer_init() error");
up_down_mixer_free(mod);
return ret;
}
Expand Down
Loading