Skip to content

audio: mixin_mixout: check sink_get_buffer() return value #10857

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
+13 −5
Open

audio: mixin_mixout: check sink_get_buffer() return value #10857

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
18 changes: 13 additions & 5 deletions src/audio/mixin_mixout/mixin_mixout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,13 @@ static int mixin_process(struct processing_module *mod,
size_t free_bytes = sink_get_free_size(sink);
size_t buf_size;

sink_get_buffer(sink, free_bytes, &mixout_data->acquired_buf.ptr,
&mixout_data->acquired_buf.buf_start, &buf_size);
ret = sink_get_buffer(sink, free_bytes, &mixout_data->acquired_buf.ptr,
&mixout_data->acquired_buf.buf_start, &buf_size);
/* on failed acquire, skip this mixout and keep mixing the rest;
* source is consumed once after the loop so it is not reprocessed
*/
if (ret < 0)
continue;
mixout_data->acquired_buf.buf_end =
(uint8_t *)mixout_data->acquired_buf.buf_start + buf_size;
mixout_data->acquired_buf_free_frames =
Expand Down Expand Up @@ -513,7 +518,7 @@ static int mixout_process(struct processing_module *mod,
uint32_t frames_to_produce = INT32_MAX;
uint32_t bytes_to_produce;
struct pending_frames *pending_frames;
int i;
int i, ret;

comp_dbg(dev, "entry");

Expand Down Expand Up @@ -574,8 +579,11 @@ static int mixout_process(struct processing_module *mod,
if (!md->acquired_buf.ptr) {
size_t buf_size;

sink_get_buffer(sinks[0], bytes_to_produce, &md->acquired_buf.ptr,
&md->acquired_buf.buf_start, &buf_size);
ret = sink_get_buffer(sinks[0], bytes_to_produce, &md->acquired_buf.ptr,
&md->acquired_buf.buf_start, &buf_size);
if (ret < 0)
return ret;

md->acquired_buf.buf_end = (uint8_t *)md->acquired_buf.buf_start + buf_size;
}

Expand Down
Loading