Skip to content

audio: mixer: Fix inactive streams handling #7420

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

Merged
dbaluta merged 1 commit into from
Apr 12, 2023
Merged

audio: mixer: Fix inactive streams handling #7420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/audio/mixer/mixer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ static int mixer_process(struct processing_module *mod,
struct mixer_data *md = module_get_private_data(mod);
struct comp_dev *dev = mod->dev;
const struct audio_stream __sparse_cache *sources_stream[PLATFORM_MAX_STREAMS];
int sources_indices[PLATFORM_MAX_STREAMS];
int32_t i = 0, j = 0;
uint32_t frames = INT32_MAX;
/* Redundant, but helps the compiler */
Expand Down Expand Up @@ -143,6 +144,7 @@ static int mixer_process(struct processing_module *mod,
if (avail_frames == 0)
continue;

sources_indices[j] = i;
sources_stream[j++] = mod->input_buffers[i].data;
}

Expand All @@ -152,7 +154,7 @@ static int mixer_process(struct processing_module *mod,

/* update source buffer consumed bytes */
for (i = 0; i < j; i++)
mod->input_buffers[i].consumed = source_bytes;
mod->input_buffers[sources_indices[i]].consumed = source_bytes;

return 0;
}
Expand Down