From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001

From: Jaroslav Kysela <perex@perex.cz>

Date: Thu, 22 Oct 2020 20:57:32 +0200

Subject: [PATCH 01/49] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be

 declared even for \!DL_ORIGIN_AVAILABLE

Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")

BugLink: https://github.com/alsa-project/alsa-lib/issues/91

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

---

 src/dlmisc.c | 2 --

 1 file changed, 2 deletions(-)

diff --git a/src/dlmisc.c b/src/dlmisc.c

index c9517c55..f20eb593 100644

--- a/src/dlmisc.c

+++ b/src/dlmisc.c

@@ -42,11 +42,9 @@

 #ifndef PIC

 struct snd_dlsym_link *snd_dlsym_start = NULL;

 #endif

-#ifdef DL_ORIGIN_AVAILABLE

 static int snd_plugin_dir_set = 0;

 static char *snd_plugin_dir = NULL;

 #endif

-#endif

 #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)

 static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;

-- 

2.29.2

From 1d993b37ab4e0b9b6e6b795d7be84ce97b29e20b Mon Sep 17 00:00:00 2001

From: Jaroslav Kysela <perex@perex.cz>

Date: Thu, 29 Oct 2020 20:31:19 +0100

Subject: [PATCH 02/49] dlmisc: fix snd_plugin_dir locking for not

 DL_ORIGIN_AVAILABLE

Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

---

 src/dlmisc.c | 4 +---

 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/dlmisc.c b/src/dlmisc.c

index f20eb593..1dd91356 100644

--- a/src/dlmisc.c

+++ b/src/dlmisc.c

@@ -46,7 +46,7 @@ static int snd_plugin_dir_set = 0;

 static char *snd_plugin_dir = NULL;

 #endif

-#if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)

+#ifdef HAVE_LIBPTHREAD

 static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;

 static inline void snd_dlpath_lock(void)

@@ -440,12 +440,10 @@ void snd_dlobj_cache_cleanup(void)

 		free(c);

 	}

 	snd_dlobj_unlock();

-#ifdef DL_ORIGIN_AVAILABLE

 	snd_dlpath_lock();

 	snd_plugin_dir_set = 0;

 	free(snd_plugin_dir);

 	snd_plugin_dir = NULL;

 	snd_dlpath_unlock();

-#endif

 }

 #endif

-- 

2.29.2

From 2757191e3b85d491705b31c6ecca2dbd96d26ade Mon Sep 17 00:00:00 2001

From: Jaroslav Kysela <perex@perex.cz>

Date: Thu, 29 Oct 2020 20:34:17 +0100

Subject: [PATCH 03/49] pcm: snd_pcm_mmap_readi - fix typo in comment

\param size frames to be *read*

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

---

 src/pcm/pcm_mmap.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c

index 9600c383..9cbaae05 100644

--- a/src/pcm/pcm_mmap.c

+++ b/src/pcm/pcm_mmap.c

@@ -183,7 +183,7 @@ snd_pcm_sframes_t snd_pcm_mmap_writen(snd_pcm_t *pcm, void **bufs, snd_pcm_ufram

  * \brief Read interleaved frames from a PCM using direct buffer (mmap)

  * \param pcm PCM handle

  * \param buffer frames containing buffer

- * \param size frames to be written

+ * \param size frames to be read

  * \return a positive number of frames actually read otherwise a

  * negative error code

  * \retval -EBADFD PCM is not in the right state (#SND_PCM_STATE_PREPARED or #SND_PCM_STATE_RUNNING)

-- 

2.29.2

From 39bd0e1a5be3620f9123f7fe72ffa6cb7d463b21 Mon Sep 17 00:00:00 2001

From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Date: Thu, 12 Nov 2020 10:29:38 -0600

Subject: [PATCH 04/49] topology: use inclusive language for bclk

use bclk_provider for structure fields, 'codec_provider' and

'codec_consumer' for options and modify #defines to use CP and CC

suffixes.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 include/sound/uapi/asoc.h | 11 +++++++----

 include/topology.h        |  2 +-

 src/topology/pcm.c        | 36 ++++++++++++++++++++++++++----------

 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/include/sound/uapi/asoc.h b/include/sound/uapi/asoc.h

index 4efb4ec4..ceafb1a9 100644

--- a/include/sound/uapi/asoc.h

+++ b/include/sound/uapi/asoc.h

@@ -169,10 +169,13 @@

 #define SND_SOC_TPLG_LNK_FLGBIT_VOICE_WAKEUP            (1 << 3)

 /* DAI topology BCLK parameter

- * For the backwards capability, by default codec is bclk master

+ * For the backwards capability, by default codec is bclk provider

  */

-#define SND_SOC_TPLG_BCLK_CM         0 /* codec is bclk master */

-#define SND_SOC_TPLG_BCLK_CS         1 /* codec is bclk slave */

+#define SND_SOC_TPLG_BCLK_CP         0 /* codec is bclk provider */

+#define SND_SOC_TPLG_BCLK_CC         1 /* codec is bclk consumer */

+/* keep previous definitions for compatibility */

+#define SND_SOC_TPLG_BCLK_CM         SND_SOC_TPLG_BCLK_CP

+#define SND_SOC_TPLG_BCLK_CS         SND_SOC_TPLG_BCLK_CC

 /* DAI topology FSYNC parameter

  * For the backwards capability, by default codec is fsync master

@@ -335,7 +338,7 @@ struct snd_soc_tplg_hw_config {

 	__u8 clock_gated;	/* SND_SOC_TPLG_DAI_CLK_GATE_ value */

 	__u8 invert_bclk;	/* 1 for inverted BCLK, 0 for normal */

 	__u8 invert_fsync;	/* 1 for inverted frame clock, 0 for normal */

-	__u8 bclk_master;	/* SND_SOC_TPLG_BCLK_ value */

+	__u8 bclk_provider;	/* SND_SOC_TPLG_BCLK_ value */

 	__u8 fsync_master;	/* SND_SOC_TPLG_FSYNC_ value */

 	__u8 mclk_direction;    /* SND_SOC_TPLG_MCLK_ value */

 	__le16 reserved;	/* for 32bit alignment */

diff --git a/include/topology.h b/include/topology.h

index 1f52e66e..6c970649 100644

--- a/include/topology.h

+++ b/include/topology.h

@@ -1028,7 +1028,7 @@ struct snd_tplg_hw_config_template {

 	unsigned char clock_gated;      /* SND_SOC_TPLG_DAI_CLK_GATE_ value */

 	unsigned char  invert_bclk;     /* 1 for inverted BCLK, 0 for normal */

 	unsigned char  invert_fsync;    /* 1 for inverted frame clock, 0 for normal */

-	unsigned char  bclk_master;     /* SND_SOC_TPLG_BCLK_ value */

+	unsigned char  bclk_provider;   /* SND_SOC_TPLG_BCLK_ value */

 	unsigned char  fsync_master;    /* SND_SOC_TPLG_FSYNC_ value */

 	unsigned char  mclk_direction;  /* SND_SOC_TPLG_MCLK_ value */

 	unsigned short reserved;        /* for 32bit alignment */

diff --git a/src/topology/pcm.c b/src/topology/pcm.c

index 191b7a0a..f05df348 100644

--- a/src/topology/pcm.c

+++ b/src/topology/pcm.c

@@ -1411,6 +1411,7 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 	snd_config_t *n;

 	const char *id, *val = NULL;

 	int ret, ival;

+	bool provider_legacy;

 	elem = tplg_elem_new_common(tplg, cfg, NULL, SND_TPLG_TYPE_HW_CONFIG);

 	if (!elem)

@@ -1451,8 +1452,15 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "bclk") == 0 ||

-		    strcmp(id, "bclk_master") == 0) {

+		provider_legacy = false;

+		if (strcmp(id, "bclk_master") == 0) {

+			SNDERR("deprecated option %s, please use 'bclk'\n", id);

+			provider_legacy = true;

+		}

+

+		if (provider_legacy ||

+		    strcmp(id, "bclk") == 0) {

+

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

@@ -1462,11 +1470,19 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 				 */

 				SNDERR("deprecated bclk value '%s'", val);

-				hw_cfg->bclk_master = SND_SOC_TPLG_BCLK_CS;

+				hw_cfg->bclk_provider = SND_SOC_TPLG_BCLK_CC;

 			} else if (!strcmp(val, "codec_slave")) {

-				hw_cfg->bclk_master = SND_SOC_TPLG_BCLK_CS;

+				SNDERR("deprecated bclk value '%s', use 'codec_consumer'", val);

+

+				hw_cfg->bclk_provider = SND_SOC_TPLG_BCLK_CC;

+			} else if (!strcmp(val, "codec_consumer")) {

+				hw_cfg->bclk_provider = SND_SOC_TPLG_BCLK_CC;

 			} else if (!strcmp(val, "codec_master")) {

-				hw_cfg->bclk_master = SND_SOC_TPLG_BCLK_CM;

+				SNDERR("deprecated bclk value '%s', use 'codec_provider", val);

+

+				hw_cfg->bclk_provider = SND_SOC_TPLG_BCLK_CP;

+			} else if (!strcmp(val, "codec_provider")) {

+				hw_cfg->bclk_provider = SND_SOC_TPLG_BCLK_CP;

 			}

 			continue;

 		}

@@ -1623,10 +1639,10 @@ int tplg_save_hw_config(snd_tplg_t *tplg ATTRIBUTE_UNUSED,

 	if (err >= 0 && hc->fmt)

 		err = tplg_save_printf(dst, pfx, "\tformat '%s'\n",

 				       get_audio_hw_format_name(hc->fmt));

-	if (err >= 0 && hc->bclk_master)

+	if (err >= 0 && hc->bclk_provider)

 		err = tplg_save_printf(dst, pfx, "\tbclk '%s'\n",

-				       hc->bclk_master == SND_SOC_TPLG_BCLK_CS ?

-						"codec_slave" : "codec_master");

+				       hc->bclk_provider == SND_SOC_TPLG_BCLK_CC ?

+						"codec_consumer" : "codec_provider");

 	if (err >= 0 && hc->bclk_rate)

 		err = tplg_save_printf(dst, pfx, "\tbclk_freq %u\n",

 				       hc->bclk_rate);

@@ -1791,7 +1807,7 @@ static int set_link_hw_config(struct snd_soc_tplg_hw_config *cfg,

 	cfg->clock_gated = tpl->clock_gated;

 	cfg->invert_bclk = tpl->invert_bclk;

 	cfg->invert_fsync = tpl->invert_fsync;

-	cfg->bclk_master = tpl->bclk_master;

+	cfg->bclk_provider = tpl->bclk_provider;

 	cfg->fsync_master = tpl->fsync_master;

 	cfg->mclk_direction = tpl->mclk_direction;

 	cfg->reserved = tpl->reserved;

@@ -2174,7 +2190,7 @@ next:

 		hw->clock_gated = link->hw_config[i].clock_gated;

 		hw->invert_bclk = link->hw_config[i].invert_bclk;

 		hw->invert_fsync = link->hw_config[i].invert_fsync;

-		hw->bclk_master = link->hw_config[i].bclk_master;

+		hw->bclk_provider = link->hw_config[i].bclk_provider;

 		hw->fsync_master = link->hw_config[i].fsync_master;

 		hw->mclk_direction = link->hw_config[i].mclk_direction;

 		hw->mclk_rate = link->hw_config[i].mclk_rate;

-- 

2.29.2

From 706192341d1d0bbb906d690b227b9dee5c1fc4b5 Mon Sep 17 00:00:00 2001

From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Date: Thu, 12 Nov 2020 10:29:39 -0600

Subject: [PATCH 05/49] topology: use inclusive language for fsync

use fsync_provider for structure fields, 'codec_provider' and

'codec_consumer' for options and modify #defines to use CP and CC

suffixes.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 include/sound/uapi/asoc.h | 11 +++++++----

 include/topology.h        |  2 +-

 src/topology/pcm.c        | 37 ++++++++++++++++++++++++++-----------

 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/include/sound/uapi/asoc.h b/include/sound/uapi/asoc.h

index ceafb1a9..f32c5697 100644

--- a/include/sound/uapi/asoc.h

+++ b/include/sound/uapi/asoc.h

@@ -178,10 +178,13 @@

 #define SND_SOC_TPLG_BCLK_CS         SND_SOC_TPLG_BCLK_CC

 /* DAI topology FSYNC parameter

- * For the backwards capability, by default codec is fsync master

+ * For the backwards capability, by default codec is fsync provider

  */

-#define SND_SOC_TPLG_FSYNC_CM         0 /* codec is fsync master */

-#define SND_SOC_TPLG_FSYNC_CS         1 /* codec is fsync slave */

+#define SND_SOC_TPLG_FSYNC_CP         0 /* codec is fsync provider */

+#define SND_SOC_TPLG_FSYNC_CC         1 /* codec is fsync consumer */

+/* keep previous definitions for compatibility */

+#define SND_SOC_TPLG_FSYNC_CM         SND_SOC_TPLG_FSYNC_CP

+#define SND_SOC_TPLG_FSYNC_CS         SND_SOC_TPLG_FSYNC_CC

 /*

  * Block Header.

@@ -339,7 +342,7 @@ struct snd_soc_tplg_hw_config {

 	__u8 invert_bclk;	/* 1 for inverted BCLK, 0 for normal */

 	__u8 invert_fsync;	/* 1 for inverted frame clock, 0 for normal */

 	__u8 bclk_provider;	/* SND_SOC_TPLG_BCLK_ value */

-	__u8 fsync_master;	/* SND_SOC_TPLG_FSYNC_ value */

+	__u8 fsync_provider;	/* SND_SOC_TPLG_FSYNC_ value */

 	__u8 mclk_direction;    /* SND_SOC_TPLG_MCLK_ value */

 	__le16 reserved;	/* for 32bit alignment */

 	__le32 mclk_rate;	/* MCLK or SYSCLK freqency in Hz */

diff --git a/include/topology.h b/include/topology.h

index 6c970649..4ade20df 100644

--- a/include/topology.h

+++ b/include/topology.h

@@ -1029,7 +1029,7 @@ struct snd_tplg_hw_config_template {

 	unsigned char  invert_bclk;     /* 1 for inverted BCLK, 0 for normal */

 	unsigned char  invert_fsync;    /* 1 for inverted frame clock, 0 for normal */

 	unsigned char  bclk_provider;   /* SND_SOC_TPLG_BCLK_ value */

-	unsigned char  fsync_master;    /* SND_SOC_TPLG_FSYNC_ value */

+	unsigned char  fsync_provider;  /* SND_SOC_TPLG_FSYNC_ value */

 	unsigned char  mclk_direction;  /* SND_SOC_TPLG_MCLK_ value */

 	unsigned short reserved;        /* for 32bit alignment */

 	unsigned int mclk_rate;	        /* MCLK or SYSCLK freqency in Hz */

diff --git a/src/topology/pcm.c b/src/topology/pcm.c

index f05df348..c8f41862 100644

--- a/src/topology/pcm.c

+++ b/src/topology/pcm.c

@@ -1504,8 +1504,15 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 			continue;

 		}

-		if (strcmp(id, "fsync") == 0 ||

-		    strcmp(id, "fsync_master") == 0) {

+		provider_legacy = false;

+		if (strcmp(id, "fsync_master") == 0) {

+			SNDERR("deprecated option %s, please use 'fsync'\n", id);

+			provider_legacy = true;

+		}

+

+		if (provider_legacy ||

+		    strcmp(id, "fsync") == 0) {

+

 			if (snd_config_get_string(n, &val) < 0)

 				return -EINVAL;

@@ -1515,11 +1522,19 @@ int tplg_parse_hw_config(snd_tplg_t *tplg, snd_config_t *cfg,

 				 */

 				SNDERR("deprecated fsync value '%s'", val);

-				hw_cfg->fsync_master = SND_SOC_TPLG_FSYNC_CS;

+				hw_cfg->fsync_provider = SND_SOC_TPLG_FSYNC_CC;

 			} else if (!strcmp(val, "codec_slave")) {

-				hw_cfg->fsync_master = SND_SOC_TPLG_FSYNC_CS;

+				SNDERR("deprecated fsync value '%s', use 'codec_consumer'", val);

+

+				hw_cfg->fsync_provider = SND_SOC_TPLG_FSYNC_CC;

+			} else if (!strcmp(val, "codec_consumer")) {

+				hw_cfg->fsync_provider = SND_SOC_TPLG_FSYNC_CC;

 			} else if (!strcmp(val, "codec_master")) {

-				hw_cfg->fsync_master = SND_SOC_TPLG_FSYNC_CM;

+				SNDERR("deprecated fsync value '%s', use 'codec_provider'", val);

+

+				hw_cfg->fsync_provider = SND_SOC_TPLG_FSYNC_CP;

+			} else if (!strcmp(val, "codec_provider")) {

+				hw_cfg->fsync_provider = SND_SOC_TPLG_FSYNC_CP;

 			}

 			continue;

 		}

@@ -1648,10 +1663,10 @@ int tplg_save_hw_config(snd_tplg_t *tplg ATTRIBUTE_UNUSED,

 				       hc->bclk_rate);

 	if (err >= 0 && hc->invert_bclk)

 		err = tplg_save_printf(dst, pfx, "\tbclk_invert 1\n");

-	if (err >= 0 && hc->fsync_master)

-		err = tplg_save_printf(dst, pfx, "\tfsync_master '%s'\n",

-				       hc->fsync_master == SND_SOC_TPLG_FSYNC_CS ?

-						"codec_slave" : "codec_master");

+	if (err >= 0 && hc->fsync_provider)

+		err = tplg_save_printf(dst, pfx, "\tfsync_provider '%s'\n",

+				       hc->fsync_provider == SND_SOC_TPLG_FSYNC_CC ?

+						"codec_consumer" : "codec_provider");

 	if (err >= 0 && hc->fsync_rate)

 		err = tplg_save_printf(dst, pfx, "\tfsync_freq %u\n",

 				       hc->fsync_rate);

@@ -1808,7 +1823,7 @@ static int set_link_hw_config(struct snd_soc_tplg_hw_config *cfg,

 	cfg->invert_bclk = tpl->invert_bclk;

 	cfg->invert_fsync = tpl->invert_fsync;

 	cfg->bclk_provider = tpl->bclk_provider;

-	cfg->fsync_master = tpl->fsync_master;

+	cfg->fsync_provider = tpl->fsync_provider;

 	cfg->mclk_direction = tpl->mclk_direction;

 	cfg->reserved = tpl->reserved;

 	cfg->mclk_rate = tpl->mclk_rate;

@@ -2191,7 +2206,7 @@ next:

 		hw->invert_bclk = link->hw_config[i].invert_bclk;

 		hw->invert_fsync = link->hw_config[i].invert_fsync;

 		hw->bclk_provider = link->hw_config[i].bclk_provider;

-		hw->fsync_master = link->hw_config[i].fsync_master;

+		hw->fsync_provider = link->hw_config[i].fsync_provider;

 		hw->mclk_direction = link->hw_config[i].mclk_direction;

 		hw->mclk_rate = link->hw_config[i].mclk_rate;

 		hw->bclk_rate = link->hw_config[i].bclk_rate;

-- 

2.29.2

From e5c350d7bc6f3d45702059c0ae8d32b3603273c1 Mon Sep 17 00:00:00 2001

From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Date: Thu, 12 Nov 2020 10:29:40 -0600

Subject: [PATCH 06/49] topology: use inclusive language in documentation

Use codec_provider and codec_consumer for bclk and fsync

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 include/topology.h | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/topology.h b/include/topology.h

index 4ade20df..d1feee4d 100644

--- a/include/topology.h

+++ b/include/topology.h

@@ -658,8 +658,8 @@ extern "C" {

  *

  *	id "1"				# used for binding to the config

  *	format "I2S"			# physical audio format.

- *	bclk   "master"			# Platform is master of bit clock

- *	fsync  "slave"			# Platform is slave of fsync

+ *	bclk   "codec_provider"		# Codec provides the bit clock

+ *	fsync  "codec_consumer"		# Codec follows the fsync

  * }

  * 

  *

-- 

2.29.2

From 7d36895225d09ae26868997382445cc7ad2e9513 Mon Sep 17 00:00:00 2001

From: Jonas Holmberg <jonashg@axis.com>

Date: Wed, 4 Nov 2020 14:49:56 +0100

Subject: [PATCH 07/49] pcm: set the snd_pcm_ioplug_status() tstamp field

Set the status tstamp field so that it can be accessed with

snd_pcm_status_get_htstamp().

Signed-off-by: Jonas Holmberg <jonashg@axis.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/pcm/pcm_ioplug.c | 1 +

 1 file changed, 1 insertion(+)

diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c

index a437ca32..9b1b8ac3 100644

--- a/src/pcm/pcm_ioplug.c

+++ b/src/pcm/pcm_ioplug.c

@@ -115,6 +115,7 @@ static int snd_pcm_ioplug_status(snd_pcm_t *pcm, snd_pcm_status_t * status)

 	snd_pcm_ioplug_hw_ptr_update(pcm);

 	status->state = io->data->state;

 	status->trigger_tstamp = io->trigger_tstamp;

+	gettimestamp(&status->tstamp, pcm->tstamp_type);

 	status->avail = snd_pcm_mmap_avail(pcm);

 	status->avail_max = io->avail_max;

 	return 0;

-- 

2.29.2

From 6d3311fefb1b41c7484fd728e4ad4a6fb5b55ad4 Mon Sep 17 00:00:00 2001

From: Takashi Iwai <tiwai@suse.de>

Date: Thu, 10 Dec 2020 10:36:41 +0100

Subject: [PATCH 08/49] Makefile: Add README.md to EXTRA_DIST

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 Makefile.am | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am

index c484d4da..ff4c963a 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -16,7 +16,7 @@ SUBDIRS += alsalisp

 endif

 endif

 SUBDIRS += test utils

-EXTRA_DIST=ChangeLog INSTALL TODO NOTES configure gitcompile libtool \

+EXTRA_DIST=README.md ChangeLog INSTALL TODO NOTES configure gitcompile libtool \

 	   depcomp version MEMORY-LEAK m4/attributes.m4

 AUTOMAKE_OPTIONS=foreign

-- 

2.29.2

From ea02dbd20a535085638c63c6b8bec94e628486c4 Mon Sep 17 00:00:00 2001

From: David Henningsson <diwic@ubuntu.com>

Date: Wed, 16 Dec 2020 19:55:22 +0100

Subject: [PATCH 09/49] pcm: Add snd_pcm_audio_tstamp_type_t constants

These are mostly a copy-paste from the kernel headers. But since functions

snd_pcm_audio_tstamp_config make use of these they should be added to the

public API as well.

Reported-by: Alex Moon <alex.r.moon@gmail.com>

Signed-off-by: David Henningsson <diwic@ubuntu.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 include/pcm.h | 14 ++++++++++++++

 1 file changed, 14 insertions(+)

diff --git a/include/pcm.h b/include/pcm.h

index 5b078231..cf1eea8b 100644

--- a/include/pcm.h

+++ b/include/pcm.h

@@ -350,6 +350,20 @@ typedef enum _snd_pcm_tstamp_type {

 	SND_PCM_TSTAMP_TYPE_LAST = SND_PCM_TSTAMP_TYPE_MONOTONIC_RAW,

 } snd_pcm_tstamp_type_t;

+typedef enum _snd_pcm_audio_tstamp_type {

+	/**

+	 * first definition for backwards compatibility only,

+	 * maps to wallclock/link time for HDAudio playback and DEFAULT/DMA time for everything else

+	 */

+	SND_PCM_AUDIO_TSTAMP_TYPE_COMPAT = 0,

+	SND_PCM_AUDIO_TSTAMP_TYPE_DEFAULT = 1,           /**< DMA time, reported as per hw_ptr */

+	SND_PCM_AUDIO_TSTAMP_TYPE_LINK = 2,	           /**< link time reported by sample or wallclock counter, reset on startup */

+	SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ABSOLUTE = 3,	   /**< link time reported by sample or wallclock counter, not reset on startup */

+	SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ESTIMATED = 4,    /**< link time estimated indirectly */

+	SND_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED = 5, /**< link time synchronized with system time */

+	SND_PCM_AUDIO_TSTAMP_TYPE_LAST = SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED

+} snd_pcm_audio_tstamp_type_t;

+

 typedef struct _snd_pcm_audio_tstamp_config {

 	/* 5 of max 16 bits used */

 	unsigned int type_requested:4;

-- 

2.29.2

From dcda999d0000cbdabe61d3d175943b5f23c30057 Mon Sep 17 00:00:00 2001

From: David Henningsson <diwic@ubuntu.com>

Date: Wed, 16 Dec 2020 20:02:52 +0100

Subject: [PATCH 10/49] test/audio_time: Make use of SND_PCM_AUDIO_TSTAMP_TYPE

 constants

Also fixup the usage row which seemed wrong to me.

Signed-off-by: David Henningsson <diwic@ubuntu.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 test/audio_time.c | 26 +++++++++++++-------------

 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/audio_time.c b/test/audio_time.c

index 530922d9..e4d4a944 100644

--- a/test/audio_time.c

+++ b/test/audio_time.c

@@ -32,7 +32,7 @@ static void usage(char *command)

 		"-d, --delay             add delay \n"

 		"-D, --device=NAME       select PCM by name \n"

 		"-p, --playback          playback tstamps \n"

-		"-t, --ts_type=TYPE      Default(0),link(1),link_estimated(2),synchronized(3) \n"

+		"-t, --ts_type=TYPE      Compat(0),default(1),link(2),link_absolute(3),link_estimated(4),link_synchronized(5) \n"

 		"-r, --report            show audio timestamp and accuracy validity\n"

 		, command);

 }

@@ -201,17 +201,17 @@ int main(int argc, char *argv[])

 			goto _exit;

 		}

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, 0))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, SND_PCM_AUDIO_TSTAMP_TYPE_COMPAT))

 			printf("Playback supports audio compat timestamps\n");

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, 1))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, SND_PCM_AUDIO_TSTAMP_TYPE_DEFAULT))

 			printf("Playback supports audio default timestamps\n");

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, 2))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, SND_PCM_AUDIO_TSTAMP_TYPE_LINK))

 			printf("Playback supports audio link timestamps\n");

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, 3))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ABSOLUTE))

 			printf("Playback supports audio link absolute timestamps\n");

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, 4))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ESTIMATED))

 			printf("Playback supports audio link estimated timestamps\n");

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, 5))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_p, SND_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED))

 			printf("Playback supports audio link synchronized timestamps\n");

 		snd_pcm_sw_params_alloca(&swparams_p);

@@ -269,17 +269,17 @@ int main(int argc, char *argv[])

 			goto _exit;

 		}

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, 0))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, SND_PCM_AUDIO_TSTAMP_TYPE_COMPAT))

 			printf("Capture supports audio compat timestamps\n");

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, 1))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, SND_PCM_AUDIO_TSTAMP_TYPE_DEFAULT))

 			printf("Capture supports audio default timestamps\n");

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, 2))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, SND_PCM_AUDIO_TSTAMP_TYPE_LINK))

 			printf("Capture supports audio link timestamps\n");

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, 3))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ABSOLUTE))

 			printf("Capture supports audio link absolute timestamps\n");

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, 4))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ESTIMATED))

 			printf("Capture supports audio link estimated timestamps\n");

-		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, 5))

+		if (snd_pcm_hw_params_supports_audio_ts_type(hwparams_c, SND_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED))

 			printf("Capture supports audio link synchronized timestamps\n");

 		snd_pcm_sw_params_alloca(&swparams_c);

-- 

2.29.2

From a9cbfecd87777d76a83e5a912ca9bdcf48e31fa9 Mon Sep 17 00:00:00 2001

From: Takashi Iwai <tiwai@suse.de>

Date: Tue, 22 Dec 2020 16:10:16 +0100

Subject: [PATCH 11/49] pcm: Fix a typo in SND_PCM_AUDIO_TSTAMP_TYPE_LAST

 definition

It was wrongly defined with SNDRV_ prefix.  Fix it.

Fixes: ea02dbd20a53 ("pcm: Add snd_pcm_audio_tstamp_type_t constants")

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 include/pcm.h | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/pcm.h b/include/pcm.h

index cf1eea8b..e300b951 100644

--- a/include/pcm.h

+++ b/include/pcm.h

@@ -361,7 +361,7 @@ typedef enum _snd_pcm_audio_tstamp_type {

 	SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ABSOLUTE = 3,	   /**< link time reported by sample or wallclock counter, not reset on startup */

 	SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ESTIMATED = 4,    /**< link time estimated indirectly */

 	SND_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED = 5, /**< link time synchronized with system time */

-	SND_PCM_AUDIO_TSTAMP_TYPE_LAST = SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED

+	SND_PCM_AUDIO_TSTAMP_TYPE_LAST = SND_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED

 } snd_pcm_audio_tstamp_type_t;

 typedef struct _snd_pcm_audio_tstamp_config {

-- 

2.29.2

From 5275d170e05639473e68e5feb349aec65bf26428 Mon Sep 17 00:00:00 2001

From: Alex Henrie <alexhenrie24@gmail.com>

Date: Sat, 26 Dec 2020 14:35:39 -0700

Subject: [PATCH 12/49] conf: fix use after free in

 _snd_config_load_with_include

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/conf.c | 4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/conf.c b/src/conf.c

index 7df2b4e7..44d1bfde 100644

--- a/src/conf.c

+++ b/src/conf.c

@@ -1970,7 +1970,9 @@ int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in,

 		SNDERR("%s:%d:%d:%s", fd->name ? fd->name : "_toplevel_", fd->line, fd->column, str);

 		goto _end;

 	}

-	if (get_char(&input) != LOCAL_UNEXPECTED_EOF) {

+	err = get_char(&input);

+	fd = input.current;

+	if (err != LOCAL_UNEXPECTED_EOF) {

 		SNDERR("%s:%d:%d:Unexpected }", fd->name ? fd->name : "", fd->line, fd->column);

 		err = -EINVAL;

 		goto _end;

-- 

2.29.2

From 0f4821ec1729cd72a3dde3ea63f7857e92a10919 Mon Sep 17 00:00:00 2001

From: Alex Henrie <alexhenrie24@gmail.com>

Date: Sat, 26 Dec 2020 14:35:40 -0700

Subject: [PATCH 13/49] ucm: fix bad frees in get_list0 and get_list20

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/ucm/main.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ucm/main.c b/src/ucm/main.c

index 3871d5aa..754b967e 100644

--- a/src/ucm/main.c

+++ b/src/ucm/main.c

@@ -666,7 +666,7 @@ static int get_list0(struct list_head *list,

 	}

 	return cnt;

       __fail:

-        snd_use_case_free_list((const char **)res, cnt);

+        snd_use_case_free_list(*result, cnt);

         return -ENOMEM;

 }

@@ -724,7 +724,7 @@ static int get_list20(struct list_head *list,

 	}

 	return cnt;

       __fail:

-        snd_use_case_free_list((const char **)res, cnt);

+        snd_use_case_free_list(*result, cnt);

         return -ENOMEM;

 }

-- 

2.29.2

From c56278cfda55b9f5d106890c7354176dba8c8f4d Mon Sep 17 00:00:00 2001

From: Alex Henrie <alexhenrie24@gmail.com>

Date: Sat, 26 Dec 2020 14:35:41 -0700

Subject: [PATCH 14/49] rawmidi: fix memory leak in snd_rawmidi_virtual_open

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 src/rawmidi/rawmidi_virt.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rawmidi/rawmidi_virt.c b/src/rawmidi/rawmidi_virt.c