Skip to content

mixin-mixout: fix 2 corner cases #7131

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
lgirdwood merged 4 commits into from
Feb 21, 2023
Merged

mixin-mixout: fix 2 corner cases #7131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b814615
module-adapter: simplify buffer counting
lyakh Feb 16, 2023
c217a5e
mixin-mixout: fix frames-to-produce calculation
lyakh Feb 20, 2023
f2359ad
mixin-mixout: fix an error case
lyakh Feb 20, 2023
a6252e8
mixin-mixout: (cosmetic) use function arguments
lyakh Feb 20, 2023
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
32 changes: 18 additions & 14 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 @@ -295,7 +295,7 @@ static int mixin_process(struct processing_module *mod,

comp_dbg(dev, "mixin_process()");

source_avail_frames = audio_stream_get_avail_frames(mod->input_buffers[0].data);
source_avail_frames = audio_stream_get_avail_frames(input_buffers[0].data);
sinks_free_frames = INT32_MAX;

/* block mixin pipeline until at least one mixout pipeline started */
Expand Down Expand Up @@ -324,7 +324,7 @@ static int mixin_process(struct processing_module *mod,
uint32_t free_frames, pending_frames;

/* unused buffer between mixin and mixout */
unused_in_between_buf_c = attr_container_of(mod->output_buffers[i].data,
unused_in_between_buf_c = attr_container_of(output_buffers[i].data,
struct comp_buffer __sparse_cache,
stream, __sparse_cache);
mixout = unused_in_between_buf_c->sink;
Expand Down Expand Up @@ -377,10 +377,10 @@ static int mixin_process(struct processing_module *mod,

frames_to_copy = MIN(source_avail_frames, sinks_free_frames);
bytes_to_consume_from_source_buf =
audio_stream_period_bytes(mod->input_buffers[0].data, frames_to_copy);
audio_stream_period_bytes(input_buffers[0].data, frames_to_copy);
if (bytes_to_consume_from_source_buf > 0) {
mod->input_buffers[0].consumed = bytes_to_consume_from_source_buf;
source_c = attr_container_of(mod->input_buffers[0].data,
input_buffers[0].consumed = bytes_to_consume_from_source_buf;
source_c = attr_container_of(input_buffers[0].data,
struct comp_buffer __sparse_cache,
stream, __sparse_cache);
buffer_stream_invalidate(source_c, bytes_to_consume_from_source_buf);
Expand Down Expand Up @@ -440,7 +440,7 @@ static int mixin_process(struct processing_module *mod,
*/
ret = mix_and_remap(dev, mixin_data, sinks_ids[i], &sink_c->stream,
start_frame, mixout_data->mixed_frames,
mod->input_buffers[0].data, frames_to_copy);
input_buffers[0].data, frames_to_copy);
if (ret < 0) {
buffer_release(sink_c);
module_source_info_release(mod_source_info);
Expand Down Expand Up @@ -499,7 +499,7 @@ static int mixout_process(struct processing_module *mod,
struct comp_dev *source;
int source_index;

source_stream = mod->input_buffers[i].data;
source_stream = input_buffers[i].data;
unused_in_between_buf = attr_container_of(source_stream,
struct comp_buffer __sparse_cache,
stream, __sparse_cache);
Expand All @@ -512,7 +512,9 @@ static int mixout_process(struct processing_module *mod,
continue;

pending_frames = md->pending_frames[source_index];
frames_to_produce = MIN(frames_to_produce, pending_frames);

if (source->state == COMP_STATE_ACTIVE || pending_frames)
frames_to_produce = MIN(frames_to_produce, pending_frames);
}

if (frames_to_produce > 0 && frames_to_produce < INT32_MAX) {
Expand All @@ -523,7 +525,7 @@ static int mixout_process(struct processing_module *mod,
int source_index;
uint32_t pending_frames;

source_stream = mod->input_buffers[i].data;
source_stream = input_buffers[i].data;
unused_in_between_buf = attr_container_of(source_stream,
struct comp_buffer __sparse_cache,
stream, __sparse_cache);
Expand All @@ -545,12 +547,14 @@ static int mixout_process(struct processing_module *mod,
md->mixed_frames -= frames_to_produce;

sink_bytes = frames_to_produce *
audio_stream_frame_bytes(mod->output_buffers[0].data);
mod->output_buffers[0].size = sink_bytes;
audio_stream_frame_bytes(output_buffers[0].data);
output_buffers[0].size = sink_bytes;
} else {
sink_bytes = dev->frames * audio_stream_frame_bytes(mod->output_buffers[0].data);
if (!audio_stream_set_zero(mod->output_buffers[0].data, sink_bytes))
mod->output_buffers[0].size = sink_bytes;
sink_bytes = dev->frames * audio_stream_frame_bytes(output_buffers[0].data);
if (!audio_stream_set_zero(output_buffers[0].data, sink_bytes))
output_buffers[0].size = sink_bytes;
else
output_buffers[0].size = 0;
}

module_source_info_release(mod_source_info);
Expand Down
20 changes: 11 additions & 9 deletions src/audio/module_adapter/module_adapter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ module_single_sink_setup(struct comp_dev *dev,
struct processing_module *mod = comp_get_drvdata(dev);
struct comp_copy_limits c;
struct list_item *blist;
uint32_t num_input_buffers = 0;
uint32_t num_input_buffers;
int i = 0;

list_for_item(blist, &dev->bsource_list) {
Expand All @@ -631,14 +631,15 @@ module_single_sink_setup(struct comp_dev *dev,
* note that the size is in number of frames not the number of
* bytes
*/
mod->input_buffers[num_input_buffers].size = c.frames;
mod->input_buffers[num_input_buffers].consumed = 0;
mod->input_buffers[i].size = c.frames;
mod->input_buffers[i].consumed = 0;

mod->input_buffers[num_input_buffers].data = &source_c[i]->stream;
num_input_buffers++;
mod->input_buffers[i].data = &source_c[i]->stream;
i++;
}

num_input_buffers = i;

mod->output_buffers[0].size = 0;
mod->output_buffers[0].data = &sinks_c[0]->stream;

Expand All @@ -654,7 +655,7 @@ module_single_source_setup(struct comp_dev *dev,
struct comp_copy_limits c;
struct list_item *blist;
uint32_t min_frames = UINT32_MAX;
uint32_t num_output_buffers = 0;
uint32_t num_output_buffers;
uint32_t source_frame_bytes = 0;
int i = 0;

Expand All @@ -664,12 +665,13 @@ module_single_source_setup(struct comp_dev *dev,
min_frames = MIN(min_frames, c.frames);
source_frame_bytes = c.source_frame_bytes;

mod->output_buffers[num_output_buffers].size = 0;
mod->output_buffers[num_output_buffers].data = &sinks_c[i]->stream;
num_output_buffers++;
mod->output_buffers[i].size = 0;
mod->output_buffers[i].data = &sinks_c[i]->stream;
i++;
}

num_output_buffers = i;

if (!mod->skip_src_buffer_invalidate)
buffer_stream_invalidate(source_c[0], min_frames * source_frame_bytes);

Expand Down