pool/alsa
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
alsa/0042-topology-add-parser-to-the-tplg_table.patch
Takashi Iwai 6ab9f38ea9 Accepting request 766329 from home:tiwai:branches:multimedia:libs 
- Backport upstream fixes:
  more topology fixes, a memory leak fix in mixer API, alsactl
  string handling fix, UCM config fixes:
  0032-Update-the-attributes.m4-macro-file-from-xine.patch
  0033-topology-avoid-to-use-the-atoi-directly-when-expecte.patch
  0034-topology-use-snd_config_get_bool-instead-own-impleme.patch
  0035-topology-fix-tplg_get_integer-handle-errno-ERANGE.patch
  0036-topology-add-tplg_get_unsigned-function.patch
  0037-topology-convert-builder-to-use-the-mallocated-memor.patch
  0038-topology-add-binary-output-from-the-builder.patch
  0039-topology-parser-recode-tplg_parse_config.patch
  0040-topology-add-snd_tplg_load-remove-snd_tplg_build_bin.patch
  0041-topology-move-the-topology-element-table-from-builde.patch
  0042-topology-add-parser-to-the-tplg_table.patch
  0043-topology-add-snd_tplg_save.patch
  0044-topology-add-snd_tplg_create-with-flags.patch
  0045-topology-add-snd_tplg_version-function.patch
  0046-topology-cleanup-the-SNDERR-calls.patch
  0047-topology-dapm-fix-the-SNDERR-Undefined.patch
  0048-topology-fix-the-unitialized-tuples.patch
  0049-topology-implement-shorter-hexa-uuid-00-00-parser.patch
  0050-topology-fix-the-TPLG_DEBUG-compilation.patch
  0051-topology-fix-the-ops-parser-accept-integer-hexa-valu.patch
  0052-topology-fix-the-wrong-memory-access-object-realloc.patch
  0053-topology-implement-snd_tplg_decode.patch
  0054-topology-move-the-elem-list-delete-to-tplg_elem_free.patch
  0055-topology-unify-the-log-mechanism.patch
  0056-topology-tplg_dbg-cleanups.patch
  0057-topology-cosmetic-changes-functions.patch
  0058-mixer-Fix-memory-leak-for-more-than-16-file-descript.patch

OBS-URL: https://build.opensuse.org/request/show/766329
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=265
2020-01-22 14:27:43 +00:00

332 lines
8.2 KiB
Diff
Raw Blame History

From 4a0efdc87355d5789876e20b9530dc85224ad281 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 15 Dec 2019 17:24:50 +0100
Subject: [PATCH 42/63] topology: add parser to the tplg_table
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
src/topology/elem.c | 35 ++++++++++++++++++
src/topology/parser.c | 90 +++++------------------------------------------
src/topology/tplg_local.h | 3 ++
3 files changed, 47 insertions(+), 81 deletions(-)
diff --git a/src/topology/elem.c b/src/topology/elem.c
index 92ca7da4c4aa..e79a68b71a91 100644
--- a/src/topology/elem.c
+++ b/src/topology/elem.c
@@ -23,112 +23,139 @@
struct tplg_table tplg_table[] = {
{
.name = "manifest",
+ .id = "SectionManifest",
.loff = offsetof(snd_tplg_t, manifest_list),
.type = SND_TPLG_TYPE_MANIFEST,
.tsoc = SND_SOC_TPLG_TYPE_MANIFEST,
.size = sizeof(struct snd_soc_tplg_manifest),
.enew = 1,
+ .parse = tplg_parse_manifest_data,
},
{
.name = "control mixer",
+ .id = "SectionControlMixer",
.loff = offsetof(snd_tplg_t, mixer_list),
.type = SND_TPLG_TYPE_MIXER,
.tsoc = SND_SOC_TPLG_TYPE_MIXER,
.size = sizeof(struct snd_soc_tplg_mixer_control),
.build = 1,
.enew = 1,
+ .parse = tplg_parse_control_mixer,
},
{
.name = "control enum",
+ .id = "SectionControlEnum",
.loff = offsetof(snd_tplg_t, enum_list),
.type = SND_TPLG_TYPE_ENUM,
.tsoc = SND_SOC_TPLG_TYPE_ENUM,
.size = sizeof(struct snd_soc_tplg_enum_control),
.build = 1,
.enew = 1,
+ .parse = tplg_parse_control_enum,
},
{
.name = "control extended (bytes)",
+ .id = "SectionControlBytes",
.loff = offsetof(snd_tplg_t, bytes_ext_list),
.type = SND_TPLG_TYPE_BYTES,
.tsoc = SND_SOC_TPLG_TYPE_BYTES,
.size = sizeof(struct snd_soc_tplg_bytes_control),
.build = 1,
.enew = 1,
+ .parse = tplg_parse_control_bytes,
},
{
.name = "dapm widget",
+ .id = "SectionWidget",
.loff = offsetof(snd_tplg_t, widget_list),
.type = SND_TPLG_TYPE_DAPM_WIDGET,
.tsoc = SND_SOC_TPLG_TYPE_DAPM_WIDGET,
.size = sizeof(struct snd_soc_tplg_dapm_widget),
.build = 1,
.enew = 1,
+ .parse = tplg_parse_dapm_widget,
},
{
.name = "pcm",
+ .id = "SectionPCM",
.loff = offsetof(snd_tplg_t, pcm_list),
.type = SND_TPLG_TYPE_PCM,
.tsoc = SND_SOC_TPLG_TYPE_PCM,
.size = sizeof(struct snd_soc_tplg_pcm),
.build = 1,
.enew = 1,
+ .parse = tplg_parse_pcm,
},
{
.name = "physical dai",
+ .id = "SectionDAI",
.loff = offsetof(snd_tplg_t, dai_list),
.type = SND_TPLG_TYPE_DAI,
.tsoc = SND_SOC_TPLG_TYPE_DAI,
.size = sizeof(struct snd_soc_tplg_dai),
.build = 1,
.enew = 1,
+ .parse = tplg_parse_dai,
},
{
.name = "be",
+ .id = "SectionBE",
+ .id2 = "SectionLink",
.loff = offsetof(snd_tplg_t, be_list),
.type = SND_TPLG_TYPE_BE,
.tsoc = SND_SOC_TPLG_TYPE_BACKEND_LINK,
.size = sizeof(struct snd_soc_tplg_link_config),
.build = 1,
.enew = 1,
+ .parse = tplg_parse_link,
},
{
.name = "cc",
+ .id = "SectionCC",
.loff = offsetof(snd_tplg_t, cc_list),
.type = SND_TPLG_TYPE_CC,
.tsoc = SND_SOC_TPLG_TYPE_CODEC_LINK,
.size = sizeof(struct snd_soc_tplg_link_config),
.build = 1,
.enew = 1,
+ .parse = tplg_parse_cc,
},
{
.name = "route (dapm graph)",
+ .id = "SectionGraph",
.loff = offsetof(snd_tplg_t, route_list),
.type = SND_TPLG_TYPE_DAPM_GRAPH,
.tsoc = SND_SOC_TPLG_TYPE_DAPM_GRAPH,
.build = 1,
+ .parse = tplg_parse_dapm_graph,
},
{
.name = "private data",
+ .id = "SectionData",
.loff = offsetof(snd_tplg_t, pdata_list),
.type = SND_TPLG_TYPE_DATA,
.tsoc = SND_SOC_TPLG_TYPE_PDATA,
.build = 1,
.enew = 1,
+ .parse = tplg_parse_data,
},
{
.name = "text",
+ .id = "SectionText",
.loff = offsetof(snd_tplg_t, text_list),
.type = SND_TPLG_TYPE_TEXT,
.size = sizeof(struct tplg_texts),
.enew = 1,
+ .parse = tplg_parse_text,
},
{
.name = "tlv",
+ .id = "SectionTLV",
.loff = offsetof(snd_tplg_t, tlv_list),
.type = SND_TPLG_TYPE_TLV,
.size = sizeof(struct snd_soc_tplg_ctl_tlv),
.enew = 1,
+ .parse = tplg_parse_tlv,
},
{
.name = "stream config",
@@ -139,30 +166,38 @@ struct tplg_table tplg_table[] = {
},
{
.name = "stream capabilities",
+ .id = "SectionPCMCapabilities",
.loff = offsetof(snd_tplg_t, pcm_caps_list),
.type = SND_TPLG_TYPE_STREAM_CAPS,
.size = sizeof(struct snd_soc_tplg_stream_caps),
.enew = 1,
+ .parse = tplg_parse_stream_caps,
},
{
.name = "token",
+ .id = "SectionVendorTokens",
.loff = offsetof(snd_tplg_t, token_list),
.type = SND_TPLG_TYPE_TOKEN,
.enew = 1,
+ .parse = tplg_parse_tokens,
},
{
.name = "tuple",
+ .id = "SectionVendorTuples",
.loff = offsetof(snd_tplg_t, tuple_list),
.type = SND_TPLG_TYPE_TUPLE,
.free = tplg_free_tuples,
.enew = 1,
+ .parse = tplg_parse_tuples,
},
{
.name = "hw config",
+ .id = "SectionHWConfig",
.loff = offsetof(snd_tplg_t, hw_cfg_list),
.type = SND_TPLG_TYPE_HW_CONFIG,
.size = sizeof(struct snd_soc_tplg_hw_config),
.enew = 1,
+ .parse = tplg_parse_hw_config,
}
};
diff --git a/src/topology/parser.c b/src/topology/parser.c
index ed864d3223c4..11202769391c 100644
--- a/src/topology/parser.c
+++ b/src/topology/parser.c
@@ -142,87 +142,11 @@ int tplg_parse_compound(snd_tplg_t *tplg, snd_config_t *cfg,
static int tplg_parse_config(snd_tplg_t *tplg, snd_config_t *cfg)
{
- static struct _parser {
- const char *id;
- int (*parser)(snd_tplg_t *tplg, snd_config_t *cfg, void *priv);
- } *p, parsers[] = {
- {
- .id = "SectionTLV",
- .parser = tplg_parse_tlv
- },
- {
- .id = "SectionControlMixer",
- .parser = tplg_parse_control_mixer
- },
- {
- .id = "SectionControlEnum",
- .parser = tplg_parse_control_enum
- },
- {
- .id = "SectionControlBytes",
- .parser = tplg_parse_control_bytes
- },
- {
- .id = "SectionWidget",
- .parser = tplg_parse_dapm_widget
- },
- {
- .id = "SectionPCMCapabilities",
- .parser = tplg_parse_stream_caps
- },
- {
- .id = "SectionPCM",
- .parser = tplg_parse_pcm
- },
- {
- .id = "SectionDAI",
- .parser = tplg_parse_dai
- },
- {
- .id = "SectionHWConfig",
- .parser = tplg_parse_hw_config
- },
- {
- .id = "SectionLink",
- .parser = tplg_parse_link
- },
- {
- .id = "SectionBE",
- .parser = tplg_parse_link
- },
- {
- .id = "SectionCC",
- .parser = tplg_parse_cc
- },
- {
- .id = "SectionGraph",
- .parser = tplg_parse_dapm_graph
- },
- {
- .id = "SectionText",
- .parser = tplg_parse_text
- },
- {
- .id = "SectionData",
- .parser = tplg_parse_data
- },
- {
- .id = "SectionVendorTokens",
- .parser = tplg_parse_tokens
- },
- {
- .id = "SectionVendorTuples",
- .parser = tplg_parse_tuples
- },
- {
- .id = "SectionManifest",
- .parser = tplg_parse_manifest_data
- },
- };
int (*parser)(snd_tplg_t *tplg, snd_config_t *cfg, void *priv);
snd_config_iterator_t i, next;
snd_config_t *n;
const char *id;
+ struct tplg_table *p;
unsigned int idx;
int err;
@@ -239,10 +163,14 @@ static int tplg_parse_config(snd_tplg_t *tplg, snd_config_t *cfg)
continue;
parser = NULL;
- for (idx = 0; idx < ARRAY_SIZE(parsers); idx++) {
- p = &parsers[idx];
- if (strcmp(id, p->id) == 0) {
- parser = p->parser;
+ for (idx = 0; idx < tplg_table_items; idx++) {
+ p = &tplg_table[idx];
+ if (p->id && strcmp(id, p->id) == 0) {
+ parser = p->parse;
+ break;
+ }
+ if (p->id2 && strcmp(id, p->id2) == 0) {
+ parser = p->parse;
break;
}
}
diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h
index 0987898f8336..bea88ba35608 100644
--- a/src/topology/tplg_local.h
+++ b/src/topology/tplg_local.h
@@ -199,6 +199,8 @@ struct map_elem {
/* mapping table */
struct tplg_table {
const char *name;
+ const char *id;
+ const char *id2;
off_t loff;
size_t size;
int type;
@@ -206,6 +208,7 @@ struct tplg_table {
unsigned build: 1;
unsigned enew: 1;
void (*free)(void *);
+ int (*parse)(snd_tplg_t *tplg, snd_config_t *cfg, void *priv);
};
extern struct tplg_table tplg_table[];
--
2.16.4
Reference in New Issue View Git Blame Copy Permalink