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

audio: copier: Split up module copier and multi-endpoint copies 

In preparation for converting the copier to use the module interface,
split up the multi-endpoint DAI copy and the module copier copy cases.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Baofeng Tian <baofeng.tian@intel.com>
This commit is contained in:
Ranjani Sridharan 2023-06-29 16:47:26 -07:00 committed by Liam Girdwood
parent 1a96df1e63
commit e424b874a4
1 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/audio/copier/copier.c
View File

@ -564,7 +564,24 @@ static int copier_copy_to_sinks(struct copier_data *cd, struct comp_dev *dev,
return ret; return ret;
} }
static int do_multi_endpoint_module_copy(struct copier_data *cd, struct comp_dev *dev) static int copier_module_copy(struct copier_data *cd, struct comp_dev *dev)
{
struct comp_buffer __sparse_cache *src_c;
struct comp_copy_limits processed_data;
struct comp_buffer *src;
int ret;
src = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
src_c = buffer_acquire(src);
ret = copier_copy_to_sinks(cd, dev, src_c, &processed_data);
buffer_release(src_c);
return ret;
}
static int copier_multi_endpoint_dai_copy(struct copier_data *cd, struct comp_dev *dev)
{ {
struct comp_buffer __sparse_cache *src_c, *sink_c; struct comp_buffer __sparse_cache *src_c, *sink_c;
struct comp_copy_limits processed_data; struct comp_copy_limits processed_data;
@ -573,44 +590,38 @@ static int do_multi_endpoint_module_copy(struct copier_data *cd, struct comp_dev
processed_data.source_bytes = 0; processed_data.source_bytes = 0;
if (cd->endpoint_num && !cd->bsource_buffer) { if (!cd->bsource_buffer) {
/* gateway(s) as input */ /* gateway(s) as input */
ret = do_endpoint_copy(dev); ret = do_endpoint_copy(dev);
if (ret < 0) if (ret < 0)
return ret; return ret;
src_c = buffer_acquire(get_endpoint_buffer(cd)); src_c = buffer_acquire(get_endpoint_buffer(cd));
} else { ret = copier_copy_to_sinks(cd, dev, src_c, &processed_data);
/* component as input */ buffer_release(src_c);
if (list_is_empty(&dev->bsource_list)) {
comp_err(dev, "No source buffer bound");
return -EINVAL;
}
src = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list); return ret;
src_c = buffer_acquire(src);
if (cd->endpoint_num) {
/* gateway(s) on output */
sink_c = buffer_acquire(get_endpoint_buffer(cd));
ret = do_conversion_copy(dev, cd, src_c, sink_c, &processed_data);
buffer_release(sink_c);
if (ret < 0) {
buffer_release(src_c);
return ret;
}
ret = do_endpoint_copy(dev);
if (ret < 0) {
buffer_release(src_c);
return ret;
}
}
} }
ret = copier_copy_to_sinks(cd, dev, src_c, &processed_data); /* component as input */
if (list_is_empty(&dev->bsource_list)) {
comp_err(dev, "No source buffer bound");
return -EINVAL;
}
src = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list);
src_c = buffer_acquire(src);
/* gateway(s) on output */
sink_c = buffer_acquire(get_endpoint_buffer(cd));
ret = do_conversion_copy(dev, cd, src_c, sink_c, &processed_data);
buffer_release(sink_c);
if (ret < 0)
goto err;
ret = do_endpoint_copy(dev);
err:
buffer_release(src_c); buffer_release(src_c);
return ret; return ret;
@ -638,16 +649,20 @@ static int copier_copy(struct comp_dev *dev)
case SOF_COMP_HOST: case SOF_COMP_HOST:
if (!cd->ipc_gtw) if (!cd->ipc_gtw)
return do_endpoint_copy(dev); return do_endpoint_copy(dev);
break;
/* do nothing in the gateway copier case */
return 0;
case SOF_COMP_DAI: case SOF_COMP_DAI:
if (cd->endpoint_num == 1) if (cd->endpoint_num == 1)
return dai_common_copy(cd->dd[0], dev, cd->converter); return dai_common_copy(cd->dd[0], dev, cd->converter);
break;
return copier_multi_endpoint_dai_copy(cd, dev);
default: default:
break; break;
} }
/* handle multi-endpoint and module copy */
return do_multi_endpoint_module_copy(cd, dev); /* module copier case */
return copier_module_copy(cd, dev);
} }
static int copier_mod_params(struct processing_module *mod) static int copier_mod_params(struct processing_module *mod)