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

Testbench: Parse all buffer widget vendor arrays 

In some topologies there is a component tokens array after buffer
tokens array for buffer widget. Since the earlier code version was
able to handle only single array and did not skip the remaining it
caused the remaining topology parsing to go out of sync and fail.

This patch changes the vendor array parsing to be similar as for PCM
widget that already had capability to handle several arrays. The core
id is retrieved if present in topology and passed via IPC.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This commit is contained in:
Seppo Ingalsuo 2020-04-20 17:19:40 +03:00 committed by Liam Girdwood
parent fed3d2f3a9
commit c614ed38bb
2 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/tplg_parser/include/tplg_parser/topology.h
View File

@ -80,6 +80,11 @@ static const struct sof_topology_token buffer_tokens[] = {
offsetof(struct sof_ipc_buffer, caps), 0},
};
static const struct sof_topology_token buffer_comp_tokens[] = {
{SOF_TKN_COMP_CORE_ID, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_uint32_t,
offsetof(struct sof_ipc_comp, core), 0},
};
/* scheduling */
static const struct sof_topology_token sched_tokens[] = {
{SOF_TKN_SCHED_PERIOD, SND_SOC_TPLG_TUPLE_TYPE_WORD,

52
tools/tplg_parser/tplg_parser.c
View File

@ -117,6 +117,8 @@ int tplg_load_buffer(int comp_id, int pipeline_id, int size,
struct sof_ipc_buffer *buffer, FILE *file)
{
struct snd_soc_tplg_vendor_array *array;
size_t read_size;
size_t parsed_size = 0;
int ret = 0;
/* configure buffer */
@ -131,23 +133,47 @@ int tplg_load_buffer(int comp_id, int pipeline_id, int size,
array = (struct snd_soc_tplg_vendor_array *)malloc(size);
if (!array) {
fprintf(stderr, "error: malloc fail during load_buffer\n");
free(array);
return -EINVAL;
}
ret = fread(array, sizeof(struct snd_soc_tplg_vendor_array), 1, file);
if (ret != 1) {
fprintf(stderr, "error: fread fail during load_buffer\n");
free(array);
return -EINVAL;
/* read vendor tokens */
while (parsed_size < size) {
read_size = sizeof(struct snd_soc_tplg_vendor_array);
ret = fread(array, read_size, 1, file);
if (ret != 1) {
fprintf(stderr,
"error: fread fail during load_buffer\n");
free(array);
return -EINVAL;
}
tplg_read_array(array, file);
/* parse buffer comp tokens */
ret = sof_parse_tokens(&buffer->comp, buffer_comp_tokens,
ARRAY_SIZE(buffer_comp_tokens), array,
array->size);
if (ret) {
fprintf(stderr, "error: parse buffer comp tokens %d\n",
size);
free(array);
return -EINVAL;
}
/* parse buffer tokens */
ret = sof_parse_tokens(buffer, buffer_tokens,
ARRAY_SIZE(buffer_tokens), array,
array->size);
if (ret) {
fprintf(stderr, "error: parse buffer tokens %d\n",
size);
free(array);
return -EINVAL;
}
parsed_size += array->size;
}
tplg_read_array(array, file);
/* parse buffer tokens */
ret = sof_parse_tokens(buffer, buffer_tokens,
ARRAY_SIZE(buffer_tokens), array, size);
free(array);
return 0;
}
@ -1144,7 +1170,7 @@ int sof_parse_tokens(void *object, const struct sof_topology_token *tokens,
priv_size -= asize;
if (priv_size < 0) {
fprintf(stderr, "error: invalid array size 0x%x\n",
fprintf(stderr, "error: invalid priv size 0x%x\n",
asize);
return -EINVAL;
}