From e2ecd74805958cd8a67f9138b50353e967f3d58e Mon Sep 17 00:00:00 2001 From: Rander Wang Date: Fri, 8 Dec 2023 17:30:42 +0800 Subject: [PATCH 1/2] module: prepare sink & source in bind & unbind function Module will update source & sink information when bind & unbind event happen. Signed-off-by: Rander Wang --- .../module_adapter/module_adapter_ipc4.c | 35 +++++++++++++------ .../sof/audio/module_adapter/module/modules.h | 2 ++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/audio/module_adapter/module_adapter_ipc4.c b/src/audio/module_adapter/module_adapter_ipc4.c index 65ca8e806e3f..def965caacb1 100644 --- a/src/audio/module_adapter/module_adapter_ipc4.c +++ b/src/audio/module_adapter/module_adapter_ipc4.c @@ -155,22 +155,35 @@ int module_adapter_get_attribute(struct comp_dev *dev, uint32_t type, void *valu return 0; } -static bool module_adapter_multi_sink_source_check(struct comp_dev *dev) +static bool module_adapter_multi_sink_source_prepare(struct comp_dev *dev) { struct processing_module *mod = comp_get_drvdata(dev); struct list_item *blist; - int num_sources = 0; - int num_sinks = 0; + int i; + + /* acquire all sink and source buffers, get handlers to sink/source API */ + i = 0; + list_for_item(blist, &dev->bsink_list) { + struct comp_buffer *sink_buffer = + container_of(blist, struct comp_buffer, source_list); + mod->sinks[i] = audio_stream_get_sink(&sink_buffer->stream); + i++; + } + mod->num_of_sinks = i; - list_for_item(blist, &dev->bsource_list) - num_sources++; + i = 0; + list_for_item(blist, &dev->bsource_list) { + struct comp_buffer *source_buffer = + container_of(blist, struct comp_buffer, sink_list); - list_for_item(blist, &dev->bsink_list) - num_sinks++; + mod->sources[i] = audio_stream_get_source(&source_buffer->stream); + i++; + } + mod->num_of_sources = i; - comp_dbg(dev, "num_sources=%d num_sinks=%d", num_sources, num_sinks); + comp_dbg(dev, "num_sources=%d num_sinks=%d", mod->num_of_sinks, mod->num_of_sources); - if (num_sources != 1 || num_sinks != 1) + if (mod->num_of_sinks != 1 || mod->num_of_sources != 1) return true; /* re-assign the source/sink modules */ @@ -190,7 +203,7 @@ int module_adapter_bind(struct comp_dev *dev, void *data) if (ret < 0) return ret; - mod->stream_copy_single_to_single = !module_adapter_multi_sink_source_check(dev); + mod->stream_copy_single_to_single = !module_adapter_multi_sink_source_prepare(dev); return 0; } @@ -204,7 +217,7 @@ int module_adapter_unbind(struct comp_dev *dev, void *data) if (ret < 0) return ret; - mod->stream_copy_single_to_single = !module_adapter_multi_sink_source_check(dev); + mod->stream_copy_single_to_single = !module_adapter_multi_sink_source_prepare(dev); return 0; } diff --git a/src/include/sof/audio/module_adapter/module/modules.h b/src/include/sof/audio/module_adapter/module/modules.h index ae514bcbf09e..bcfe2a6ae795 100644 --- a/src/include/sof/audio/module_adapter/module/modules.h +++ b/src/include/sof/audio/module_adapter/module/modules.h @@ -66,6 +66,8 @@ static inline void declare_dynamic_module_adapter(struct comp_driver *drv, drv->ops.set_large_config = module_set_large_config; drv->ops.get_large_config = module_get_large_config; drv->ops.get_attribute = module_adapter_get_attribute; + drv->ops.bind = module_adapter_bind; + drv->ops.unbind = module_adapter_unbind; } #endif /* __SOF_AUDIO_MODULES__ */ From 47f4c21fa9423e41f37e491730e22ef72bb223cd Mon Sep 17 00:00:00 2001 From: Rander Wang Date: Tue, 12 Dec 2023 20:01:16 +0800 Subject: [PATCH 2/2] module_adapter: remove redundant sink & source update in prepare for ipc4 They are done in bind & unbind(). But we need to keep it for ipc3. Signed-off-by: Marcin Szkudlinski Signed-off-by: Rander Wang --- src/audio/module_adapter/module_adapter.c | 33 ------------------- .../module_adapter/module_adapter_ipc3.c | 33 +++++++++++++++++++ .../module_adapter/module_adapter_ipc4.c | 8 +++++ .../sof/audio/module_adapter/module/generic.h | 1 + 4 files changed, 42 insertions(+), 33 deletions(-) diff --git a/src/audio/module_adapter/module_adapter.c b/src/audio/module_adapter/module_adapter.c index e30c6cbc51cb..3304a7298093 100644 --- a/src/audio/module_adapter/module_adapter.c +++ b/src/audio/module_adapter/module_adapter.c @@ -119,39 +119,6 @@ struct comp_dev *module_adapter_new(const struct comp_driver *drv, return NULL; } -static int module_adapter_sink_src_prepare(struct comp_dev *dev) -{ - struct processing_module *mod = comp_get_drvdata(dev); - struct list_item *blist; - int ret; - int i; - - /* acquire all sink and source buffers, get handlers to sink/source API */ - i = 0; - list_for_item(blist, &dev->bsink_list) { - struct comp_buffer *sink_buffer = - container_of(blist, struct comp_buffer, source_list); - mod->sinks[i] = audio_stream_get_sink(&sink_buffer->stream); - i++; - } - mod->num_of_sinks = i; - - i = 0; - list_for_item(blist, &dev->bsource_list) { - struct comp_buffer *source_buffer = - container_of(blist, struct comp_buffer, sink_list); - - mod->sources[i] = audio_stream_get_source(&source_buffer->stream); - i++; - } - mod->num_of_sources = i; - - /* Prepare module */ - ret = module_prepare(mod, mod->sources, mod->num_of_sources, mod->sinks, mod->num_of_sinks); - - return ret; -} - #if CONFIG_ZEPHYR_DP_SCHEDULER static int module_adapter_dp_queue_prepare(struct comp_dev *dev) { diff --git a/src/audio/module_adapter/module_adapter_ipc3.c b/src/audio/module_adapter/module_adapter_ipc3.c index 7c3a2f1afb29..920eb4f0f169 100644 --- a/src/audio/module_adapter/module_adapter_ipc3.c +++ b/src/audio/module_adapter/module_adapter_ipc3.c @@ -287,3 +287,36 @@ int module_adapter_cmd(struct comp_dev *dev, int cmd, void *data, int max_data_s comp_dbg(dev, "module_adapter_cmd() done"); return ret; } + +int module_adapter_sink_src_prepare(struct comp_dev *dev) +{ + struct processing_module *mod = comp_get_drvdata(dev); + struct list_item *blist; + int ret; + int i; + + /* acquire all sink and source buffers, get handlers to sink/source API */ + i = 0; + list_for_item(blist, &dev->bsink_list) { + struct comp_buffer *sink_buffer = + container_of(blist, struct comp_buffer, source_list); + mod->sinks[i] = audio_stream_get_sink(&sink_buffer->stream); + i++; + } + mod->num_of_sinks = i; + + i = 0; + list_for_item(blist, &dev->bsource_list) { + struct comp_buffer *source_buffer = + container_of(blist, struct comp_buffer, sink_list); + + mod->sources[i] = audio_stream_get_source(&source_buffer->stream); + i++; + } + mod->num_of_sources = i; + + /* Prepare module */ + ret = module_prepare(mod, mod->sources, mod->num_of_sources, mod->sinks, mod->num_of_sinks); + + return ret; +} diff --git a/src/audio/module_adapter/module_adapter_ipc4.c b/src/audio/module_adapter/module_adapter_ipc4.c index def965caacb1..c30e8646c5bf 100644 --- a/src/audio/module_adapter/module_adapter_ipc4.c +++ b/src/audio/module_adapter/module_adapter_ipc4.c @@ -237,3 +237,11 @@ uint64_t module_adapter_get_total_data_processed(struct comp_dev *dev, return mod->total_data_consumed; } +int module_adapter_sink_src_prepare(struct comp_dev *dev) +{ + struct processing_module *mod = comp_get_drvdata(dev); + + /* Prepare module */ + return module_prepare(mod, mod->sources, mod->num_of_sources, + mod->sinks, mod->num_of_sinks); +} diff --git a/src/include/sof/audio/module_adapter/module/generic.h b/src/include/sof/audio/module_adapter/module/generic.h index 1ab2485fe348..52208f70f62d 100644 --- a/src/include/sof/audio/module_adapter/module/generic.h +++ b/src/include/sof/audio/module_adapter/module/generic.h @@ -325,4 +325,5 @@ void module_adapter_check_data(struct processing_module *mod, struct comp_dev *d void module_adapter_set_params(struct processing_module *mod, struct sof_ipc_stream_params *params); int module_adapter_set_state(struct processing_module *mod, struct comp_dev *dev, int cmd); +int module_adapter_sink_src_prepare(struct comp_dev *dev); #endif /* __SOF_AUDIO_MODULE_GENERIC__ */