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
45 changes: 31 additions & 14 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 @@ -450,40 +450,57 @@ up_down_mixer_process(struct processing_module *mod,
struct comp_dev *dev = mod->dev;

size_t output_frames, input_frames, ret, input_cirbuf_size, output_cirbuf_size;
const uint8_t *input0_pos, *input0_start;
uint8_t *output_pos, *output_start;
const uint8_t *input_pos, *input_start, *input_end;
uint8_t *output_pos, *output_start, *output_end;
int output_frames_without_wrap;
int frames_without_wrap, frames, frames_remain;
uint32_t input_bytes;

comp_dbg(dev, "up_down_mixer_process()");

output_frames = sink_get_free_frames(output_buffers[0]);
input_frames = source_get_data_frames_available(input_buffers[0]);
frames = MIN(input_frames, output_frames);

const size_t output_frame_bytes = sink_get_frame_bytes(output_buffers[0]);

ret = sink_get_buffer(output_buffers[0], output_frames * output_frame_bytes,
ret = sink_get_buffer(output_buffers[0], frames * output_frame_bytes,
(void **)&output_pos, (void **)&output_start, &output_cirbuf_size);
if (ret)
return -ENODATA;

const size_t input0_frame_bytes = source_get_frame_bytes(input_buffers[0]);
const size_t input_frame_bytes = source_get_frame_bytes(input_buffers[0]);

ret = source_get_data(input_buffers[0], input_frames * input0_frame_bytes,
(const void **)&input0_pos, (const void **)&input0_start,
ret = source_get_data(input_buffers[0], frames * input_frame_bytes,
(const void **)&input_pos, (const void **)&input_start,
&input_cirbuf_size);
if (ret) {
sink_commit_buffer(output_buffers[0], 0);
return -ENODATA;
}

cd->mix_routine(cd, (const void *)input0_start, input_cirbuf_size, (void *)output_start);

ret = sink_commit_buffer(output_buffers[0], output_frames * output_frame_bytes);
if (ret)
return ret;
input_end = input_start + input_cirbuf_size;
output_end = output_start + output_cirbuf_size;
frames_remain = frames;
while (frames_remain) {
frames_without_wrap = (input_end - input_pos) / input_frame_bytes;
frames_without_wrap = MIN(frames_without_wrap, frames);
Comment on lines +508 to +509
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.

Do we align any of this to SIMD width ? Not just in this module, but in the C coded logic ?

output_frames_without_wrap = (output_end - output_pos) / output_frame_bytes;
frames_without_wrap = MIN(frames_without_wrap, output_frames_without_wrap);
input_bytes = input_frame_bytes * frames_without_wrap;
cd->mix_routine(cd, (const void *)input_pos, input_bytes, (void *)output_pos);

input_pos += input_bytes;
output_pos += frames_without_wrap * output_frame_bytes;
input_pos = (input_pos >= input_end) ? input_pos - input_cirbuf_size : input_pos;
output_pos = (output_pos >= output_end) ?
output_pos - output_cirbuf_size : output_pos;
frames_remain -= frames_without_wrap;
}

ret = source_release_data(input_buffers[0], input_frames * input0_frame_bytes);
if (ret)
return ret;
/* Ignore possible -ENODATA, can happen in start with zero frames to process */
sink_commit_buffer(output_buffers[0], frames * output_frame_bytes);
source_release_data(input_buffers[0], frames * input_frame_bytes);
return 0;
}

Expand Down