Skip to content

src: cosmetic: simplify an invalid configuration check #10626

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

Open
lyakh wants to merge 2 commits into
base: main
Choose a base branch
from
+28 −23
Open

src: cosmetic: simplify an invalid configuration check #10626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c33b4d
src: cosmetic: simplify an invalid configuration check
lyakh Mar 16, 2026
cb8bbf9
audio: src: only allocate delay lines if size changes
lyakh Mar 17, 2026
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
25 changes: 15 additions & 10 deletions src/audio/src/src_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,7 @@ int src_params_general(struct processing_module *mod,
struct comp_data *cd = module_get_private_data(mod);
struct comp_dev *dev = mod->dev;
size_t delay_lines_size;
size_t old_total;
int32_t *buffer_start;
int n;
int err;
Expand Down Expand Up @@ -511,6 +512,8 @@ int src_params_general(struct processing_module *mod,
cd->source_frames = dev->frames * cd->source_rate / cd->sink_rate;
cd->sink_frames = dev->frames;

old_total = cd->param.total;

/* Allocate needed memory for delay lines */
err = src_buffer_lengths(dev, cd, cd->channels_count);
if (err < 0) {
Expand All @@ -523,21 +526,23 @@ int src_params_general(struct processing_module *mod,
* be aligned to 8 bytes as required by some Xtensa
* instructions (e.g AE_L32X2F24_XC)
*/
delay_lines_size = ALIGN_UP(sizeof(int32_t) * cd->param.total, 8);
if (delay_lines_size == 0) {
comp_err(dev, "delay_lines_size = 0");
if (cd->param.total == 0) {
comp_err(dev, "configuration failed: total size = 0");

return -EINVAL;
}
delay_lines_size = ALIGN_UP(sizeof(int32_t) * cd->param.total, 8);

/* free any existing delay lines. TODO reuse if same size */
mod_free(mod, cd->delay_lines);
if (!cd->delay_lines || old_total != cd->param.total) {
/* free any existing delay lines */
mod_free(mod, cd->delay_lines);

cd->delay_lines = mod_alloc(mod, delay_lines_size);
if (!cd->delay_lines) {
comp_err(dev, "failed to alloc cd->delay_lines, delay_lines_size = %zu",
delay_lines_size);
return -EINVAL;
cd->delay_lines = mod_alloc(mod, delay_lines_size);
if (!cd->delay_lines) {
comp_err(dev, "failed to alloc cd->delay_lines, delay_lines_size = %zu",
delay_lines_size);
return -EINVAL;
}
}

/* Clear all delay lines here */
Expand Down
26 changes: 13 additions & 13 deletions src/audio/src/src_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,25 @@ struct src_stage {
int idm;
int odm;
int num_of_subfilters;
int subfilter_length;
int filter_length;
int blk_in;
int blk_out;
size_t subfilter_length;
Copy link
Copy Markdown
Collaborator

@singalsu singalsu Mar 24, 2026

Choose a reason for hiding this comment

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

These are not sizes in bytes. Also in some architectures size_t is 64 bits. I prefer just int for a generic integer number. Also unsigned int would be better than size_t. But you know that I don't like it either. Just unnecessary code acrobatics to use a restricted range integer type. It's not improving code efficiency.

size_t filter_length;
size_t blk_in;
size_t blk_out;
int halfband;
int shift;
const void *coefs; /* Can be int16_t or int32_t depending on config */
};

struct src_param {
int fir_s1;
int fir_s2;
int out_s1;
int out_s2;
int sbuf_length;
int src_multich;
int total;
int blk_in;
int blk_out;
size_t fir_s1;
size_t fir_s2;
size_t out_s1;
size_t out_s2;
size_t sbuf_length;
size_t src_multich;
size_t total;
size_t blk_in;
size_t blk_out;
int stage1_times;
int stage2_times;
int idx_in;
Expand Down
Loading