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

codec_adapter: accept 0 size library config 

There could be some codecs which require 0 byte library configure, e.g.
the passthrough one, change to make this possible.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
This commit is contained in:
Keyon Jie 2021-03-23 18:43:35 +08:00
parent 041c2ef6de
commit b3e4a71ba5
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/audio/codec_adapter/codec_adapter.c
View File

@ -139,8 +139,8 @@ static int load_setup_config(struct comp_dev *dev, void *cfg, uint32_t size)
(uintptr_t)cfg, size);
ret = -EINVAL;
goto end;
} else if (size <= sizeof(struct ca_config)) {
comp_err(dev, "load_setup_config(): no codec config available.");
} else if (size < sizeof(struct ca_config)) {
comp_err(dev, "load_setup_config(): no codec config available, size %d", size);
ret = -EIO;
goto end;
}
@ -154,13 +154,15 @@ static int load_setup_config(struct comp_dev *dev, void *cfg, uint32_t size)
goto end;
}
/* Copy codec specific part */
lib_cfg = (char *)cfg + sizeof(struct ca_config);
lib_cfg_size = size - sizeof(struct ca_config);
ret = codec_load_config(dev, lib_cfg, lib_cfg_size, CODEC_CFG_SETUP);
if (ret) {
comp_err(dev, "load_setup_config(): %d: failed to load setup config for codec id %x",
ret, cd->ca_config.codec_id);
goto end;
if (lib_cfg_size) {
lib_cfg = (char *)cfg + sizeof(struct ca_config);
ret = codec_load_config(dev, lib_cfg, lib_cfg_size, CODEC_CFG_SETUP);
if (ret) {
comp_err(dev, "load_setup_config(): %d: failed to load setup config for codec id %x",
ret, cd->ca_config.codec_id);
goto end;
}
}
comp_dbg(dev, "load_setup_config() done.");