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

audio: module_adapter: Ensure prepare always runs on modules 

Some components like mixer have special handling of the prepare function
whenever they are already active. Ensure said handling has a chance to
run.

With the old code, that code doesn't run, mixer doesn't have a chance to
return PPL_STATUS_PATH_STOP and the DAI then receives a second prepare
request, which is invalid given that it's already active.

Signed-off-by: Paul Olaru <paul.olaru@nxp.com>
This commit is contained in:
Paul Olaru 2023-03-31 13:22:26 +03:00 committed by Daniel Baluta
parent 908876cc5f
commit 5f26af9494
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,21 +167,16 @@ int module_adapter_prepare(struct comp_dev *dev)
comp_dbg(dev, "module_adapter_prepare() start");
/*
* check if the component is already active. This could happen in the case of mixer when
* one of the sources is already active
*/
if (dev->state == COMP_STATE_ACTIVE)
return 0;
/* Prepare module */
ret = module_prepare(mod);
if (ret) {
if (ret == PPL_STATUS_PATH_STOP)
return ret;
/* Are we already prepared? */
ret = comp_set_state(dev, COMP_TRIGGER_PREPARE);
if (ret < 0)
return ret;
comp_err(dev, "module_adapter_prepare() error %x: module prepare failed",
ret);
if (ret == COMP_STATUS_STATE_ALREADY_SET) {
comp_warn(dev, "module_adapter_prepare(): module has already been prepared");
return PPL_STATUS_PATH_STOP;
return -EIO;
}
/* Get period_bytes first on prepare(). At this point it is guaranteed that the stream
@ -195,16 +190,21 @@ int module_adapter_prepare(struct comp_dev *dev)
buffer_release(sink_c);
/* Prepare module */
ret = module_prepare(mod);
if (ret) {
if (ret == PPL_STATUS_PATH_STOP)
return ret;
/*
* check if the component is already active. This could happen in the case of mixer when
* one of the sources is already active
*/
if (dev->state == COMP_STATE_ACTIVE)
return PPL_STATUS_PATH_STOP;
comp_err(dev, "module_adapter_prepare() error %x: module prepare failed",
ret);
/* Are we already prepared? */
ret = comp_set_state(dev, COMP_TRIGGER_PREPARE);
if (ret < 0)
return ret;
return -EIO;
if (ret == COMP_STATUS_STATE_ALREADY_SET) {
comp_warn(dev, "module_adapter_prepare(): module has already been prepared");
return PPL_STATUS_PATH_STOP;
}
mod->deep_buff_bytes = 0;