OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

module_adapter: produce/consume only from the active buffers 

In the simple_copy case, source/sink modules that aren't active are
skipped when passing the buffers to the process callback. So,
produce/consume from only the active buffers that were passed to the
process callback as well.

Reported-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2023-01-04 10:06:07 -08:00 committed by Liam Girdwood
parent 33fa026524
commit f8bdef3baa
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/audio/module_adapter/module_adapter.c
View File

@ -560,27 +560,6 @@ static void module_adapter_process_output(struct comp_dev *dev)
struct list_item *blist;
int i = 0;
/*
* When a module produces only period_bytes every period, the produced samples are written
* to the output buffer stream directly. So, just writeback buffer stream and reset size.
*/
if (mod->simple_copy) {
list_for_item(blist, &dev->bsink_list) {
sink = container_of(blist, struct comp_buffer, source_list);
sink_c = buffer_acquire(sink);
if (!mod->skip_sink_buffer_writeback)
buffer_stream_writeback(sink_c, mod->output_buffers[i].size);
comp_update_buffer_produce(sink_c, mod->output_buffers[i].size);
buffer_release(sink_c);
mod->output_buffers[i].size = 0;
i++;
}
return;
}
/*
* copy all produced output samples to output buffers. This loop will do nothing when
* there are no samples produced.
@ -814,17 +793,42 @@ int module_adapter_copy(struct comp_dev *dev)
}
if (mod->simple_copy) {
/* consume from all active input buffers */
for (i = 0; i < num_input_buffers; i++) {
struct comp_buffer __sparse_cache *src_c;
src_c = attr_container_of(mod->input_buffers[i].data,
struct comp_buffer __sparse_cache,
stream, __sparse_cache);
comp_update_buffer_consume(src_c, mod->input_buffers[i].consumed);
}
/* release all source buffers */
i = 0;
list_for_item(blist, &dev->bsource_list) {
comp_update_buffer_consume(source_c[i], mod->input_buffers[i].consumed);
buffer_release(source_c[i]);
mod->input_buffers[i].size = 0;
mod->input_buffers[i].consumed = 0;
i++;
}
/* produce data into all active output buffers */
for (i = 0; i < num_output_buffers; i++) {
sink_c = attr_container_of(mod->output_buffers[i].data,
struct comp_buffer __sparse_cache,
stream, __sparse_cache);
if (!mod->skip_sink_buffer_writeback)
buffer_stream_writeback(sink_c, mod->output_buffers[i].size);
comp_update_buffer_produce(sink_c, mod->output_buffers[i].size);
}
/* release all sink buffers */
i = 0;
list_for_item(blist, &dev->bsink_list)
buffer_release(sinks_c[i++]);
list_for_item(blist, &dev->bsink_list) {
buffer_release(sinks_c[i]);
mod->output_buffers[i++].size = 0;
}
} else {
i = 0;
/* consume from all input buffers */
@ -842,10 +846,9 @@ int module_adapter_copy(struct comp_dev *dev)
mod->input_buffers[i].consumed = 0;
i++;
}
module_adapter_process_output(dev);
}
module_adapter_process_output(dev);
return 0;
out: