Skip to content

audio: mux: fix input buffer consumption for mixed channel counts #10631

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
abonislawski wants to merge 1 commit into
base: main
Choose a base branch
from
Open

audio: mux: fix input buffer consumption for mixed channel counts #10631

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
7 changes: 3 additions & 4 deletions src/audio/mux/mux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ static int mux_process(struct processing_module *mod,
const struct audio_stream *sources_stream[MUX_MAX_STREAMS] = { NULL };
int frames = 0;
int sink_bytes;
int source_bytes;
int i, j;

comp_dbg(dev, "entry");
Expand Down Expand Up @@ -341,18 +340,18 @@ static int mux_process(struct processing_module *mod,
if (num_input_buffers == 0)
return 0;

source_bytes = frames * audio_stream_frame_bytes(mod->input_buffers[0].data);
sink_bytes = frames * audio_stream_frame_bytes(mod->output_buffers[0].data);
mux_prepare_active_look_up(cd, output_buffers[0].data, &sources_stream[0]);

/* produce output */
cd->mux(dev, output_buffers[0].data, &sources_stream[0], frames, &cd->active_lookup);

/* Update consumed and produced */
/* Update consumed per source using each source's own frame size */
j = 0;
comp_dev_for_each_producer(dev, source) {
if (comp_buffer_get_source_state(source) == dev->state)
mod->input_buffers[j].consumed = source_bytes;
mod->input_buffers[j].consumed =
frames * audio_stream_frame_bytes(mod->input_buffers[j].data);
j++;
}
mod->output_buffers[0].size = sink_bytes;
Expand Down
Loading