asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2025-01-03 13:59:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

topology: Expand attribute references inside $[] expressions

Browse source 
Properly expand referred object attributes inside $[] expression. This
allows for example this simplified case:

Define {
       CHANNELS 2
       BIT_DEPTH 16
}

Object.Base.foo {
	channels	$CHANNELS
	sample_bits	$BIT_DEPTH
	frame_bits	"$[$channels * $sample_bits]"
}

Closes: https://github.com/alsa-project/alsa-utils/pull/250
Reported-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jyri Sarha 2023-12-31 03:10:19 +02:00 committed by Jaroslav Kysela
parent 6eb1eb5047
commit 0029ab7cc7
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
topology/pre-process-object.c
View file

@ -1603,6 +1603,7 @@ pre_process_object_variables_expand_fcn(snd_config_t **dst, const char *str, voi
snd_config_t *object_cfg = tplg_pp->current_obj_cfg; snd_config_t *object_cfg = tplg_pp->current_obj_cfg;
snd_config_t *conf_defines; snd_config_t *conf_defines;
const char *object_id; const char *object_id;
const char *val;
int ret; int ret;
ret = snd_config_search(tplg_pp->input_cfg, "Define", &conf_defines); ret = snd_config_search(tplg_pp->input_cfg, "Define", &conf_defines);
@ -1614,14 +1615,30 @@ pre_process_object_variables_expand_fcn(snd_config_t **dst, const char *str, voi
if (ret >= 0) if (ret >= 0)
return ret; return ret;
/* No global define found, proceeed to object attribute search */
if (snd_config_get_id(object_cfg, &object_id) < 0) if (snd_config_get_id(object_cfg, &object_id) < 0)
return -EINVAL; return -EINVAL;
/* find variable from object attribute values if not found in global definitions */ /* find variable from object attribute values if not found in global definitions */
ret = pre_process_find_variable(dst, str, object_cfg); ret = pre_process_find_variable(dst, str, object_cfg);
if (ret < 0) if (ret < 0) {
SNDERR("Failed to find definition for attribute %s in '%s' object\n", SNDERR("Failed to find definition for attribute %s in '%s' object\n",
str, object_id); str, object_id);
return ret;
}
/* the extracted value may contain a nested $-expression */
if (snd_config_get_string(*dst, &val) >= 0) {
if (val[0] == '$') {
char *var = strdup(val);
snd_config_delete(*dst);
ret = snd_config_evaluate_string(dst, var,
pre_process_object_variables_expand_fcn,
tplg_pp);
free(var);
}
}
return ret; return ret;
} }