topology: Updates for PCM object in ABI v5

From: Mengdong Lin <[email protected]>

Users can define flags by both text conf file and C API. Add flags and flag_mask to C API template of PCM object.

Signed-off-by Mengdong Lin <[email protected]>

include/topology.h +7 -0

index ccd8401..b6a6f19 100644
@@ -606,6 +606,11 @@ extern "C" {
  *			"config3"
  *		]
  *	}
+ *
+ *	# Optional boolean flags
+ *	symmetric_rates			"true"
+ *	symmetric_channels		"true"
+ *	symmetric_sample_bits		"false"
  * }
  * </pre>
  *

@@ -863,6 +868,8 @@ struct snd_tplg_pcm_template {
 	unsigned int capture;	/*!< supports capture mode */
 	unsigned int compress;	/*!< 1 = compressed; 0 = PCM */
 	struct snd_tplg_stream_caps_template *caps[2]; /*!< playback & capture for DAI */
+	unsigned int flag_mask; /*!< bitmask of flags to configure */
+	unsigned int flags;     /*!< flag value SND_SOC_TPLG_LNK_FLGBIT_* */
 	int num_streams;	/*!< number of supported configs */
 	struct snd_tplg_stream_template stream[0]; /*!< supported configs */
 };

src/topology/pcm.c +4 -0

index 6fdf047..bd70dc9 100644
@@ -364,6 +364,24 @@ static int tplg_parse_fe_dai(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
 	return 0;
 }
 
+/* parse a flag bit of the given mask */
+static int parse_flag(snd_config_t *n, unsigned int mask_in,
+		      unsigned int *mask, unsigned int *flags)
+{

src/topology/pcm.c +35 -0

+
+	return 0;
+}
+
 /* Parse pcm (for front end DAI & DAI link) */
 int tplg_parse_pcm(snd_tplg_t *tplg,
 	snd_config_t *cfg, void *private ATTRIBUTE_UNUSED)

@@ -430,6 +448,34 @@ int tplg_parse_pcm(snd_tplg_t *tplg,
 				return err;
 			continue;
 		}
+
+		/* flags */
+		if (strcmp(id, "symmetric_rates") == 0) {
+			err = parse_flag(n,
+				SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_RATES,
+				&pcm->flag_mask, &pcm->flags);
+			if (err < 0)
+				return err;
+			continue;
+		}
+
+		if (strcmp(id, "symmetric_channels") == 0) {
+			err = parse_flag(n,
+				SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_CHANNELS,
+				&pcm->flag_mask, &pcm->flags);
+			if (err < 0)
+				return err;
+			continue;
+		}
+
+		if (strcmp(id, "symmetric_sample_bits") == 0) {
+			err = parse_flag(n,
+				SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS,
+				&pcm->flag_mask, &pcm->flags);
+			if (err < 0)
+				return err;
+			continue;
+		}
 	}
 
 	return 0;

@@ -610,6 +656,9 @@ int tplg_add_pcm_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
 			tplg_add_stream_caps(&pcm->caps[i], pcm_tpl->caps[i]);
 	}
 
+	pcm->flag_mask = pcm_tpl->flag_mask;
+	pcm->flags = pcm_tpl->flags;
+
 	pcm->num_streams = pcm_tpl->num_streams;
 	for (i = 0; i < pcm_tpl->num_streams; i++)
 		tplg_add_stream_object(&pcm->stream[i], &pcm_tpl->stream[i]);

Signature · 1 line

2.7.4

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Saturday, November 5, 2016 11:46 PM

Quoted 1 line

src/topology/pcm.c static int tplg_parse_fe_dai(snd_tplg_t *tplg ATTRIBUTE_UNUSED, · line 380

Quoted 13 lines

src/topology/pcm.c +13 -0

+/* parse a flag bit of the given mask */ static int
+parse_flag(snd_config_t *n, unsigned int mask_in,
+		      unsigned int *mask, unsigned int *flags) {
+	const char *val = NULL;
+
+	if (snd_config_get_string(n, &val) < 0)
+		return -EINVAL;
+
+	*mask |= mask_in;
+	if (strcmp(val, "true") == 0)
+		*flags |= mask_in;
+	else
+		*flags &= ~mask_in;

This can be simplified with snd_config_get_bool().

thanks,

Takashi

Quoted 7 lines

src/topology/pcm.c +4 -0

+
+	return 0;
+}
+
 /* Parse pcm (for front end DAI & DAI link) */  int

tplg_parse_pcm(snd_tplg_t *tplg,
snd_config_t *cfg, void *private ATTRIBUTE_UNUSED) @@ -430,6

+448,34

src/topology/pcm.c int tplg_parse_pcm(snd_tplg_t *tplg, · line 461

Quoted 9 lines

@@ int tplg_parse_pcm(snd_tplg_t *tplg,

src/topology/pcm.c +5 -0

 				return err;
 			continue;
 		}
+
+		/* flags */
+		if (strcmp(id, "symmetric_rates") == 0) {
+			err = parse_flag(n,
+

SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_RATES,

src/topology/pcm.c int tplg_parse_pcm(snd_tplg_t *tplg, · line 470

Quoted 9 lines

src/topology/pcm.c +9 -0

+				&pcm->flag_mask, &pcm->flags);
+			if (err < 0)
+				return err;
+			continue;
+		}
+
+		if (strcmp(id, "symmetric_channels") == 0) {
+			err = parse_flag(n,
+

SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_CHANNELS,

src/topology/pcm.c int tplg_parse_pcm(snd_tplg_t *tplg,

Quoted 9 lines

src/topology/pcm.c +9 -0

+				&pcm->flag_mask, &pcm->flags);
+			if (err < 0)
+				return err;
+			continue;
+		}
+
+		if (strcmp(id, "symmetric_sample_bits") == 0) {
+			err = parse_flag(n,
+

SND_SOC_TPLG_LNK_FLGBIT_SYMMETRIC_SAMPLEBITS,

src/topology/pcm.c int tplg_add_pcm_object(snd_tplg_t *tplg,

Quoted 9 lines

src/topology/pcm.c +5 -0

+				&pcm->flag_mask, &pcm->flags);
+			if (err < 0)
+				return err;
+			continue;
+		}
 	}
 
 	return 0;

@@ -610,6 +656,9 @@ int tplg_add_pcm_object(snd_tplg_t *tplg,

snd_tplg_obj_template_t *t)

Quoted 14 lines

src/topology/pcm.c +3 -0

 			tplg_add_stream_caps(&pcm->caps[i], pcm_tpl-
 caps[i]);
 	}
 
+	pcm->flag_mask = pcm_tpl->flag_mask;
+	pcm->flags = pcm_tpl->flags;
+
 	pcm->num_streams = pcm_tpl->num_streams;
 	for (i = 0; i < pcm_tpl->num_streams; i++)

tplg_add_stream_object(&pcm->stream[i], &pcm_tpl-
stream[i]);
--
2.7.4

-----Original Message-----
From: [email protected] [mailto:[email protected]]
Sent: Friday, November 4, 2016 7:00 AM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Shah, Hardik T <[email protected]>; Singh, Guneshwor O <[email protected]>; Koul, Vinod <[email protected]>; Lin, Mengdong <[email protected]>; Mengdong Lin <[email protected]>
Subject: [PATCH 0/6] topology: Updates for PCM object in ABI v5

From: Mengdong Lin <[email protected]>

These ABI updates for PCM have just been applied to ASoC kernel. And kernel can handle the PCM ABI updates in a backward compatible way.

So we update the user space code for PCM now.

The updates for physical DAI link and DAIs will come later after their kernel updates be applied at first.

Mengdong Lin (6):
topology: ABI - Update stream caps and PCM objects to ABI v5
topology: Parse sig_bits of stream caps
topology: Parse flags for PCM
topology: Define a function to build a single PCM element
topology: Parse and build private data for PCM
topology: tplg_elem_lookup() checks parameter before searching

 include/sound/asoc.h      |   9 ++++
 include/topology.h        |  11 +++++
 src/topology/elem.c       |   3 ++
 src/topology/parser.c     |   2 +-
 src/topology/pcm.c        | 120
++++++++++++++++++++++++++++++++++++++++++++--
 src/topology/tplg_local.h |   2 +-
 6 files changed, 140 insertions(+), 7 deletions(-)

--
2.7.4

From: Mengdong Lin <[email protected]>

These ABI updates for PCM have just been applied to ASoC kernel. And kernel can handle the PCM ABI updates in a backward compatible way.

So we update the user space code for PCM now.

The updates for physical DAI link and DAIs will come later after their kernel updates be applied at first.

Mengdong Lin (6):
topology: ABI - Update stream caps and PCM objects to ABI v5
topology: Parse sig_bits of stream caps
topology: Parse flags for PCM
topology: Define a function to build a single PCM element
topology: Parse and build private data for PCM
topology: tplg_elem_lookup() checks parameter before searching