From: GuruprasadX Pawse Date: Tue, 2 Jan 2018 05:20:01 +0000 (+0530) Subject: topology: Fix to skip writing of header for compound elements X-Git-Tag: android-x86-9.0-r1~239 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc68f69a66d55e8ba7e1d885ce81c129c7f2a7b9;p=android-x86%2Fexternal-alsa-lib.git topology: Fix to skip writing of header for compound elements While calculating the size of data to be written into the topology binary file, the size of the compound elements is added as well. This results in wrong file offset calculation and topology build failure. The compound elements shouldn't be written to the topology as these are already embedded as part of other elements. So, skip adding the size of compound elements to the file offset size calculation. Signed-off-by: GuruprasadX Pawse Signed-off-by: Subhransu S. Prusty Signed-off-by: Guneshwor Singh Signed-off-by: Takashi Iwai --- diff --git a/src/topology/builder.c b/src/topology/builder.c index 997df0c7..5ae3ae89 100644 --- a/src/topology/builder.c +++ b/src/topology/builder.c @@ -95,6 +95,10 @@ static int write_elem_block(snd_tplg_t *tplg, list_for_each(pos, base) { /* find elems with the same index to make a block */ elem = list_entry(pos, struct tplg_elem, list); + + if (elem->compound_elem) + continue; + elem_next = list_entry(pos->next, struct tplg_elem, list); block_size += elem->size; count++;