mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-11 13:30:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

topology: Group elements with the same index value into a block

Browse source 
Topology objects(widgets,controls) with different index value should be grouped
into different blocks and the block headers contain the index value.

Signed-off-by: Fuwei Tang <fuweix.tang@intel.com>
Reviewed-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Fuwei Tang 2017-04-13 14:52:47 +08:00 • committed by Takashi Iwai
parent a3b4bd2c8c
commit bfd712fe32
1 changed files with 49 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

90
src/topology/builder.c
View file

@ -86,58 +86,66 @@ static int write_block_header(snd_tplg_t *tplg, unsigned int type,
static int write_elem_block(snd_tplg_t *tplg,
struct list_head *base, int size, int tplg_type, const char *obj_name)
{
struct list_head *pos;
struct tplg_elem *elem;
int ret, wsize = 0, count = 0, vendor_type;
struct list_head *pos, *sub_pos, *sub_base;
struct tplg_elem *elem, *elem_next;
int ret, wsize = 0, total_size = 0, count = 0, block_size = 0;
/* count number of elements */
list_for_each(pos, base)
count++;
if (!count)
return 0;
/* write the header for this block */
elem = list_entry(base->next, struct tplg_elem, list);
vendor_type = elem->vendor_type;
ret = write_block_header(tplg, tplg_type, vendor_type,
tplg->version, 0, size, count);
if (ret < 0) {
SNDERR("error: failed to write %s block %d\n",
obj_name, ret);
return ret;
}
/* write each elem to block */
sub_base = base;
list_for_each(pos, base) {
/* find elems with the same index to make a block */
elem = list_entry(pos, struct tplg_elem, list);
elem_next = list_entry(pos->next, struct tplg_elem, list);
block_size += elem->size;
count++;
/* compound elems have already been copied to other elems */
if (elem->compound_elem)
continue;
if ((pos->next == base) || (elem_next->index != elem->index)) {
/* write header for the block */
ret = write_block_header(tplg, tplg_type, elem->vendor_type,
tplg->version, elem->index, block_size, count);
if (ret < 0) {
SNDERR("error: failed to write %s block %d\n",
obj_name, ret);
return ret;
}
if (elem->type != SND_TPLG_TYPE_DAPM_GRAPH)
verbose(tplg, " %s '%s': write %d bytes\n",
obj_name, elem->id, elem->size);
else
verbose(tplg, " %s '%s': write %d bytes\n",
obj_name, elem->route->source, elem->size);
/* write elems for the block */
list_for_each(sub_pos, sub_base) {
elem = list_entry(sub_pos, struct tplg_elem, list);
/* compound elems have already been copied to other elems */
if (elem->compound_elem)
continue;
count = write(tplg->out_fd, elem->obj, elem->size);
if (count < 0) {
SNDERR("error: failed to write %s %d\n",
obj_name, ret);
return ret;
if (elem->type != SND_TPLG_TYPE_DAPM_GRAPH)
verbose(tplg, " %s '%s': write %d bytes\n",
obj_name, elem->id, elem->size);
else
verbose(tplg, " %s '%s': write %d bytes\n",
obj_name, elem->route->source, elem->size);
wsize = write(tplg->out_fd, elem->obj, elem->size);
if (wsize < 0) {
SNDERR("error: failed to write %s %d\n",
obj_name, ret);
return ret;
}
total_size += wsize;
/* get to the end of sub list */
if (sub_pos == pos)
break;
}
/* the last elem of the current sub list as the head of
next sub list*/
sub_base = pos;
count = 0;
block_size = 0;
}
wsize += count;
}
/* make sure we have written the correct size */
if (wsize != size) {
if (total_size != size) {
SNDERR("error: size mismatch. Expected %d wrote %d\n",
size, wsize);
size, total_size);
return -EIO;
}