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

From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>

Date: Thu, 26 Jun 2014 13:30:25 +0300

Subject: [PATCH 01/35] ucm: Document PlaybackPCMIsDummy and CapturePCMIsDummy

 values

At least PulseAudio needs special handling for dummy devices. To allow

that to happen automatically, the UCM configuration should contain the

information about which PCMs are dummy.

Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>

Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>

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

---

 include/use-case.h | 10 ++++++++++

 1 file changed, 10 insertions(+)

diff --git a/include/use-case.h b/include/use-case.h

index 4e13249..f30168f 100644

--- a/include/use-case.h

+++ b/include/use-case.h

@@ -258,7 +258,17 @@ int snd_use_case_get_list(snd_use_case_mgr_t *uc_mgr,

  * Recommended names for values:

  *   TQ			- Tone Quality

  *   PlaybackPCM	- full PCM playback device name

+ *   PlaybackPCMIsDummy	- Valid values: "yes" and "no". If set to "yes", the

+ *			  PCM named by the PlaybackPCM value is a dummy device,

+ *			  meaning that opening it enables an audio path in the

+ *			  hardware, but writing to the PCM device has no

+ *			  effect.

  *   CapturePCM		- full PCM capture device name

+ *   CapturePCMIsDummy	- Valid values: "yes" and "no". If set to "yes", the

+ *			  PCM named by the CapturePCM value is a dummy device,

+ *			  meaning that opening it enables an audio path in the

+ *			  hardware, but reading from the PCM device has no

+ *			  effect.

  *   PlaybackRate	- playback device sample rate

  *   PlaybackChannels	- playback device channel count

  *   PlaybackCTL	- playback control device name

-- 

1.9.3

From 27cc710b5784cb3ab68cff2a9d9daf9fa479149e Mon Sep 17 00:00:00 2001

From: "Alexander E. Patrakov" <patrakov@gmail.com>

Date: Tue, 1 Jul 2014 00:40:48 +0600

Subject: [PATCH 02/35] ICE1712: add surround71 pcm definition

The M-Audio Delta 1010 card has 7.1 analog output, but no ready-made pcm

definition to use it.

Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>

Reported-and-tested-by: Matt Zagrabelny <mzagrabe@d.umn.edu>

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

---

 src/conf/cards/ICE1712.conf | 22 ++++++++++++++++++++++

 1 file changed, 22 insertions(+)

diff --git a/src/conf/cards/ICE1712.conf b/src/conf/cards/ICE1712.conf

index 398fa7a..db62684 100644

--- a/src/conf/cards/ICE1712.conf

+++ b/src/conf/cards/ICE1712.conf

@@ -78,6 +78,7 @@ ICE1712.pcm.surround40.0 {

 <confdir:pcm/surround41.conf>

 <confdir:pcm/surround50.conf>

 <confdir:pcm/surround51.conf>

+<confdir:pcm/surround71.conf>

 ICE1712.pcm.surround51.0 {

 	@args [ CARD ]

@@ -98,6 +99,27 @@ ICE1712.pcm.surround51.0 {

 	slave.channels 10

 }

+ICE1712.pcm.surround71.0 {

+	@args [ CARD ]

+	@args.CARD {

+		type string

+	}

+	type route

+	ttable.0.0 1

+	ttable.1.1 1

+	ttable.2.2 1

+	ttable.3.3 1

+	ttable.4.4 1

+	ttable.5.5 1

+	ttable.6.6 1

+	ttable.7.7 1

+	slave.pcm {

+		type hw

+		card $CARD

+	}

+	slave.channels 10

+}

+

 <confdir:pcm/iec958.conf>

 ICE1712.pcm.iec958.0 {

-- 

1.9.3

From ea865bba4615d906144ae5d4f72a4aad2baffe1f Mon Sep 17 00:00:00 2001

From: Anssi Hannula <anssi.hannula@iki.fi>

Date: Tue, 8 Jul 2014 11:19:20 +0300

Subject: [PATCH 03/35] USB-Audio: Add second S/PDIF device on Phiree U2

Phiree U2 has an unusual configuration. It only has S/PDIF output, but

there are still two devices presented:

- device 0: PCM audio, subject to volume control

- device 1: non-PCM data (passthrough), not subject to volume control

It looks like the AES bits are set according to the selected device,

since outputting PCM data via device 1 will not work (silence).

Currently only the device 0 is shown via the "iec958" alias, and the

second device is not accessible via hinted aliases.

Simply provide access to both of these devices via the "iec958" alias.

Reported-by: touc @ XBMC forum

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>

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

---

 src/conf/cards/USB-Audio.conf | 40 ++++++++++++++++++++++++++++++++++++++++

 1 file changed, 40 insertions(+)

diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf

index ce3ae01..77a48b9 100644

--- a/src/conf/cards/USB-Audio.conf

+++ b/src/conf/cards/USB-Audio.conf

@@ -52,6 +52,11 @@ USB-Audio.pcm.iec958_device {

 	"USB Device 0x46d:0x992" 999

 }

+# Second iec958 device number, if any.

+USB-Audio.pcm.iec958_2_device {

+	"PHIREE U2" 1  # 0 = PCM S/PDIF, 1 = non-PCM S/PDIF

+}

+

 # If a device requires non-standard definitions for front, surround40,

 # surround51, surround71 or iec958, they can be defined here.

@@ -422,4 +427,39 @@ USB-Audio.pcm.iec958.0 {

 	}

 }

+USB-Audio.pcm.iec958.1 {

+	@args [ CARD AES0 AES1 AES2 AES3 ]

+	@args.CARD { type string }

+	@args.AES0 { type integer }

+	@args.AES1 { type integer }

+	@args.AES2 { type integer }

+	@args.AES3 { type integer }

+	@func refer

+	name {

+		@func concat

+		strings [

+			"cards.USB-Audio."

+			{ @func card_name card $CARD }

+			".pcm.iec958_2:CARD=" $CARD

+			",AES0=" $AES0 ",AES1=" $AES1 ",AES2=" $AES2 ",AES3=" $AES3

+		]

+	}

+	default {

+		# FIXME: we cannot set the AES parameters

+		type hw

+		card $CARD

+		device {

+			@func refer

+			name {

+				@func concat

+				strings [

+					"cards.USB-Audio.pcm.iec958_2_device."

+					{ @func card_name card $CARD }

+				]

+			}

+			default 999

+		}

+	}

+}

+

 # vim: ft=alsaconf

-- 

1.9.3

From 035f196bcdc1e9903ed52ad1859dc23d3aa74e72 Mon Sep 17 00:00:00 2001

From: Shengjiu Wang <shengjiu.wang@freescale.com>

Date: Mon, 14 Jul 2014 16:55:48 +0800

Subject: [PATCH 04/35] pcm: rate: fix hw_ptr exceed the boundary

For long time test case, the hw_ptr will exceed the boundary, then cause

the avail size wrong.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>

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

---

 src/pcm/pcm_rate.c | 2 ++

 1 file changed, 2 insertions(+)

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

index 7f667d4..2563d82 100644

--- a/src/pcm/pcm_rate.c

+++ b/src/pcm/pcm_rate.c

@@ -574,6 +574,8 @@ static inline void snd_pcm_rate_sync_hwptr(snd_pcm_t *pcm)

 	rate->hw_ptr =

 		(slave_hw_ptr / rate->gen.slave->period_size) * pcm->period_size +

 		rate->ops.input_frames(rate->obj, slave_hw_ptr % rate->gen.slave->period_size);

+

+	rate->hw_ptr %= pcm->boundary;

 }

 static int snd_pcm_rate_hwsync(snd_pcm_t *pcm)

-- 

1.9.3

From 85e4704151677b8fcc5ccfc396071828e9ec1b8e Mon Sep 17 00:00:00 2001

From: Mark Brown <broonie@linaro.org>

Date: Tue, 8 Jul 2014 16:52:32 +0200

Subject: [PATCH 05/35] pcm: Provide a CLOCK_MONOTONIC_RAW timestamp type

For applications which need to synchronise with external timebases such

as broadcast TV applications the kernel monotonic time is not optimal as

it includes adjustments from NTP and so may still include discontinuities

due to that. A raw monotonic time which does not include any adjustments

is available in the kernel from getrawmonotonic() so provide userspace with

a new timestamp type SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW which provides

timestamps based on this as an option.

Reported-by: Daniel Thompson <daniel.thompson@linaro.org>

Signed-off-by: Mark Brown <broonie@linaro.org>

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

---

 include/sound/asound.h | 3 ++-

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

diff --git a/include/sound/asound.h b/include/sound/asound.h

index 1774a5c..9061cdd 100644

--- a/include/sound/asound.h

+++ b/include/sound/asound.h

@@ -457,7 +457,8 @@ struct snd_xfern {

 enum {

 	SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0,	/* gettimeofday equivalent */

 	SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,	/* posix_clock_monotonic equivalent */

-	SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,

+	SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW,	/* monotonic_raw (no NTP) */

+	SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW,

 };

 /* channel positions */

-- 

1.9.3

From 5250a8e212fd927735cfc27612b060c31dc3a230 Mon Sep 17 00:00:00 2001

From: Takashi Iwai <tiwai@suse.de>

Date: Thu, 10 Jul 2014 14:22:33 +0200

Subject: [PATCH 06/35] Add timestamp type to sw_params (internal only)

This patch is just the udpate of sound/asound.h taken from the kernel

commit.  The API changes and PCM structure changes will follow after

this.

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

---

 include/sound/asound.h | 6 ++++--

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

diff --git a/include/sound/asound.h b/include/sound/asound.h

index 9061cdd..552f41b 100644

--- a/include/sound/asound.h

+++ b/include/sound/asound.h

@@ -136,7 +136,7 @@ struct snd_hwdep_dsp_image {

  *                                                                           *

  *****************************************************************************/

-#define SNDRV_PCM_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 11)

+#define SNDRV_PCM_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 12)

 typedef unsigned long snd_pcm_uframes_t;

 typedef signed long snd_pcm_sframes_t;

@@ -386,7 +386,9 @@ struct snd_pcm_sw_params {

 	snd_pcm_uframes_t silence_threshold;	/* min distance from noise for silence filling */

 	snd_pcm_uframes_t silence_size;		/* silence block size */

 	snd_pcm_uframes_t boundary;		/* pointers wrap point */

-	unsigned char reserved[64];		/* reserved for future */

+	unsigned int tstamp_type;		/* timestamp type */

+	int pads;				/* alignment, reserved */

+	unsigned char reserved[56];		/* reserved for future */

 };

 struct snd_pcm_channel_info {

-- 

1.9.3

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

From: Takashi Iwai <tiwai@suse.de>

Date: Thu, 10 Jul 2014 14:26:37 +0200

Subject: [PATCH 07/35] pcm: Add sw_params API functions to get/set timestamp

 type

For obtaining / changing the timestamp type, add the corresponding

sw_params accessor API functions together with the public definitions

of timestamp types.

This patch only adds the functions and defines but doesn't bring the

functional changes yet.

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

---

 include/pcm.h        |  9 +++++++++

 src/pcm/pcm.c        | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++

 src/pcm/pcm_local.h  |  1 +

 src/pcm/pcm_params.c |  1 +

 4 files changed, 64 insertions(+)

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

index 95b8aed..11e9f0d 100644

--- a/include/pcm.h

+++ b/include/pcm.h

@@ -317,6 +317,13 @@ typedef enum _snd_pcm_tstamp {

 	SND_PCM_TSTAMP_LAST = SND_PCM_TSTAMP_ENABLE

 } snd_pcm_tstamp_t;

+typedef enum _snd_pcm_tstamp_type {

+	SND_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0,	/** gettimeofday equivalent */

+	SND_PCM_TSTAMP_TYPE_MONOTONIC,	/** posix_clock_monotonic equivalent */

+	SND_PCM_TSTAMP_TYPE_MONOTONIC_RAW,	/** monotonic_raw (no NTP) */

+	SND_PCM_TSTAMP_TYPE_LAST = SND_PCM_TSTAMP_TYPE_MONOTONIC_RAW,

+} snd_pcm_tstamp_type_t;

+

 /** Unsigned frames quantity */

 typedef unsigned long snd_pcm_uframes_t;

 /** Signed frames quantity */

@@ -844,6 +851,8 @@ int snd_pcm_sw_params_get_boundary(const snd_pcm_sw_params_t *params, snd_pcm_uf

 int snd_pcm_sw_params_set_tstamp_mode(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_tstamp_t val);

 int snd_pcm_sw_params_get_tstamp_mode(const snd_pcm_sw_params_t *params, snd_pcm_tstamp_t *val);

+int snd_pcm_sw_params_set_tstamp_type(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_tstamp_type_t val);

+int snd_pcm_sw_params_get_tstamp_type(const snd_pcm_sw_params_t *params, snd_pcm_tstamp_type_t *val);

 int snd_pcm_sw_params_set_avail_min(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val);

 int snd_pcm_sw_params_get_avail_min(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val);

 int snd_pcm_sw_params_set_period_event(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, int val);

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

index 7e46014..8984443 100644

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

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

@@ -1483,6 +1483,7 @@ int snd_pcm_poll_descriptors_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsign

 #define XRUN(v) [SND_PCM_XRUN_##v] = #v

 #define SILENCE(v) [SND_PCM_SILENCE_##v] = #v

 #define TSTAMP(v) [SND_PCM_TSTAMP_##v] = #v

+#define TSTAMP_TYPE(v) [SND_PCM_TSTAMP_TYPE_##v] = #v

 #define ACCESS(v) [SND_PCM_ACCESS_##v] = #v

 #define START(v) [SND_PCM_START_##v] = #v

 #define HW_PARAM(v) [SND_PCM_HW_PARAM_##v] = #v

@@ -1680,6 +1681,12 @@ static const char *const snd_pcm_tstamp_mode_names[] = {

 	TSTAMP(NONE),

 	TSTAMP(ENABLE),

 };

+

+static const char *const snd_pcm_tstamp_type_names[] = {

+	TSTAMP_TYPE(GETTIMEOFDAY),

+	TSTAMP_TYPE(MONOTONIC),

+	TSTAMP_TYPE(MONOTONIC_RAW),

+};

 #endif

 /**

@@ -1826,6 +1833,18 @@ const char *snd_pcm_tstamp_mode_name(snd_pcm_tstamp_t mode)

 }

 /**

+ * \brief get name of PCM tstamp type setting

+ * \param mode PCM tstamp type

+ * \return ascii name of PCM tstamp type setting

+ */

+const char *snd_pcm_tstamp_type_name(snd_pcm_tstamp_t type)

+{

+	if (type > SND_PCM_TSTAMP_TYPE_LAST)

+		return NULL;

+	return snd_pcm_tstamp_type_names[type];

+}

+

+/**

  * \brief get name of PCM state

  * \param state PCM state

  * \return ascii name of PCM state

@@ -1899,6 +1918,7 @@ int snd_pcm_dump_sw_setup(snd_pcm_t *pcm, snd_output_t *out)

 		return -EIO;

 	}

 	snd_output_printf(out, "  tstamp_mode  : %s\n", snd_pcm_tstamp_mode_name(pcm->tstamp_mode));

+	snd_output_printf(out, "  tstamp_type  : %s\n", snd_pcm_tstamp_type_name(pcm->tstamp_mode));

 	snd_output_printf(out, "  period_step  : %d\n", pcm->period_step);

 	snd_output_printf(out, "  avail_min    : %ld\n", pcm->avail_min);

 	snd_output_printf(out, "  period_event : %i\n", pcm->period_event);

@@ -5591,6 +5611,7 @@ int snd_pcm_sw_params_current(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)

 		return -EIO;

 	}

 	params->tstamp_mode = pcm->tstamp_mode;

+	params->tstamp_type = pcm->tstamp_type;

 	params->period_step = pcm->period_step;

 	params->sleep_min = 0;

 	params->avail_min = pcm->avail_min;

@@ -5613,6 +5634,7 @@ int snd_pcm_sw_params_current(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)

 int snd_pcm_sw_params_dump(snd_pcm_sw_params_t *params, snd_output_t *out)

 {

 	snd_output_printf(out, "tstamp_mode: %s\n", snd_pcm_tstamp_mode_name(params->tstamp_mode));

+	snd_output_printf(out, "tstamp_type: %s\n", snd_pcm_tstamp_type_name(params->tstamp_type));

 	snd_output_printf(out, "period_step: %u\n", params->period_step);

 	snd_output_printf(out, "avail_min: %lu\n", params->avail_min);

 	snd_output_printf(out, "start_threshold: %ld\n", params->start_threshold);

@@ -5811,6 +5833,37 @@ int snd_pcm_sw_params_get_tstamp_mode(const snd_pcm_sw_params_t *params, snd_pcm

 }

 /**

+ * \brief Set timestamp type inside a software configuration container

+ * \param pcm PCM handle

+ * \param params Software configuration container

+ * \param val Timestamp type

+ * \return 0 otherwise a negative error code

+ */

+int snd_pcm_sw_params_set_tstamp_type(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_tstamp_type_t val)

+{

+	assert(pcm && params);

+	if (CHECK_SANITY(val > SND_PCM_TSTAMP_TYPE_LAST)) {

+		SNDMSG("invalid tstamp_type value %d", val);

+		return -EINVAL;

+	}

+	params->tstamp_type = val;

+	return 0;

+}

+

+/**

+ * \brief Get timestamp type from a software configuration container

+ * \param params Software configuration container

+ * \param val Returned timestamp type

+ * \return 0 otherwise a negative error code

+ */

+int snd_pcm_sw_params_get_tstamp_type(const snd_pcm_sw_params_t *params, snd_pcm_tstamp_type_t *val)

+{

+	assert(params && val);

+	*val = params->tstamp_type;

+	return 0;

+}

+

+/**

  * \brief (DEPRECATED) Set minimum number of ticks to sleep inside a software configuration container

  * \param pcm PCM handle

  * \param params Software configuration container

diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h

index 8a6c743..3ed7e1a 100644

--- a/src/pcm/pcm_local.h

+++ b/src/pcm/pcm_local.h

@@ -202,6 +202,7 @@ struct _snd_pcm {

 	unsigned int period_time;	/* period duration */

 	snd_interval_t periods;

 	snd_pcm_tstamp_t tstamp_mode;	/* timestamp mode */

+	snd_pcm_tstamp_type_t tstamp_type;	/* timestamp type */

 	unsigned int period_step;

 	snd_pcm_uframes_t avail_min;	/* min avail frames for wakeup */

 	int period_event;

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

index 0b66e8c..4adbefa 100644

--- a/src/pcm/pcm_params.c

+++ b/src/pcm/pcm_params.c

@@ -2258,6 +2258,7 @@ static int snd_pcm_sw_params_default(snd_pcm_t *pcm, snd_pcm_sw_params_t *params

 	assert(pcm && params);

 	assert(pcm->setup);

 	params->tstamp_mode = SND_PCM_TSTAMP_NONE;

+	params->tstamp_type = pcm->tstamp_type;

 	params->period_step = 1;

 	params->sleep_min = 0;

 	params->avail_min = pcm->period_size;

-- 

1.9.3

From 9b716075de4f2f7f15e428ee7efaa8960ef45b9c Mon Sep 17 00:00:00 2001

From: Takashi Iwai <tiwai@suse.de>

Date: Thu, 10 Jul 2014 14:32:50 +0200

Subject: [PATCH 08/35] pcm: Implement timestamp type setup in hw plugin

This patch implements the support for sw_params timestamp type in PCM

hw layer.  As gettimestamp() is still unchanged, the resultant

timstamps may be still with CLOCK_MONOTONIC even if you pass monotonic

raw type.  More fixes will follow.

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

---

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

 1 file changed, 32 insertions(+), 5 deletions(-)

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

index ed83197..bafa8de 100644

--- a/src/pcm/pcm_hw.c

+++ b/src/pcm/pcm_hw.c

@@ -304,7 +304,8 @@ static int snd_pcm_hw_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)

 	if (params->info != ~0U) {

 		params->info &= ~0xf0000000;

-		params->info |= (pcm->monotonic ? SND_PCM_INFO_MONOTONIC : 0);

+		if (pcm->tstamp_type != SND_PCM_TSTAMP_TYPE_GETTIMEOFDAY)

+			params->info |= SND_PCM_INFO_MONOTONIC;

 	}

 	return 0;

@@ -328,7 +329,8 @@ static int snd_pcm_hw_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)

 		return err;

 	}

 	params->info &= ~0xf0000000;

-	params->info |= (pcm->monotonic ? SND_PCM_INFO_MONOTONIC : 0);

+	if (pcm->tstamp_type != SND_PCM_TSTAMP_TYPE_GETTIMEOFDAY)

+		params->info |= SND_PCM_INFO_MONOTONIC;

 	err = sync_ptr(hw, 0);

 	if (err < 0)

 		return err;

@@ -435,6 +437,7 @@ static int snd_pcm_hw_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)

 	int old_period_event = sw_get_period_event(params);

 	sw_set_period_event(params, 0);

 	if ((snd_pcm_tstamp_t) params->tstamp_mode == pcm->tstamp_mode &&

+	    (snd_pcm_tstamp_type_t) params->tstamp_type == pcm->tstamp_type &&

 	    params->period_step == pcm->period_step &&

 	    params->start_threshold == pcm->start_threshold &&

 	    params->stop_threshold == pcm->stop_threshold &&

@@ -444,11 +447,33 @@ static int snd_pcm_hw_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params)

 		hw->mmap_control->avail_min = params->avail_min;

 		return sync_ptr(hw, 0);

 	}

+	if (params->tstamp_type == SND_PCM_TSTAMP_TYPE_MONOTONIC_RAW &&

+	    hw->version < SNDRV_PROTOCOL_VERSION(2, 0, 12)) {

+		SYSMSG("Kernel doesn't support SND_PCM_TSTAMP_TYPE_MONOTONIC_RAW");

+		return -EINVAL;

+	}

+	if (params->tstamp_type == SND_PCM_TSTAMP_TYPE_MONOTONIC &&

+	    hw->version < SNDRV_PROTOCOL_VERSION(2, 0, 5)) {

+		SYSMSG("Kernel doesn't support SND_PCM_TSTAMP_TYPE_MONOTONIC");

+		return -EINVAL;

+	}

 	if (ioctl(fd, SNDRV_PCM_IOCTL_SW_PARAMS, params) < 0) {

 		err = -errno;

 		SYSMSG("SNDRV_PCM_IOCTL_SW_PARAMS failed (%i)", err);

 		return err;

 	}

+	if ((snd_pcm_tstamp_type_t) params->tstamp_type != pcm->tstamp_type) {

+		if (hw->version < SNDRV_PROTOCOL_VERSION(2, 0, 12)) {

+			int on = (snd_pcm_tstamp_type_t) params->tstamp_type ==

+				SND_PCM_TSTAMP_TYPE_MONOTONIC;

+			if (ioctl(fd, SNDRV_PCM_IOCTL_TSTAMP, &on) < 0) {

+				err = -errno;

+				SNDMSG("TSTAMP failed\n");

+				return err;

+			}

+		}

+		pcm->tstamp_type = params->tstamp_type;

+	}

 	sw_set_period_event(params, old_period_event);

 	hw->mmap_control->avail_min = params->avail_min;

 	if (hw->period_event != old_period_event) {

@@ -1381,7 +1406,8 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name,

 		       int fd, int mmap_emulation ATTRIBUTE_UNUSED,

 		       int sync_ptr_ioctl)

 {

-	int ver, mode, monotonic = 0;

+	int ver, mode;

+	snd_pcm_tstamp_type_t tstamp_type = SND_PCM_TSTAMP_TYPE_GETTIMEOFDAY;

 	long fmode;

 	snd_pcm_t *pcm = NULL;

 	snd_pcm_hw_t *hw = NULL;

@@ -1429,7 +1455,7 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name,

 				SNDMSG("TTSTAMP failed\n");

 				return ret;

 			}

-			monotonic = 1;

+			tstamp_type = SND_PCM_TSTAMP_TYPE_MONOTONIC;

 		}

 	} else

 #endif

@@ -1471,7 +1497,8 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name,

 	pcm->private_data = hw;

 	pcm->poll_fd = fd;

 	pcm->poll_events = info.stream == SND_PCM_STREAM_PLAYBACK ? POLLOUT : POLLIN;

-	pcm->monotonic = monotonic;

+	pcm->tstamp_type = tstamp_type;

+	pcm->monotonic = tstamp_type != SND_PCM_TSTAMP_TYPE_GETTIMEOFDAY;

 	ret = snd_pcm_hw_mmap_status(pcm);

 	if (ret < 0) {

-- 

1.9.3

From 65ff6fdafb705b5e2e6d4b9a94a80e5de89f5de1 Mon Sep 17 00:00:00 2001

From: Takashi Iwai <tiwai@suse.de>

Date: Thu, 10 Jul 2014 14:37:49 +0200

Subject: [PATCH 09/35] pcm: Implement timestamp type handling in all plugins

Now all PCM plugins do support the proper timestamp type or pass it

over slaves.  The internal monotonic flag is dropped and replaced with

tstamp_type in all places.

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

---

 src/pcm/pcm_adpcm.c     |  2 +-

 src/pcm/pcm_alaw.c      |  2 +-

 src/pcm/pcm_copy.c      |  2 +-

 src/pcm/pcm_direct.c    |  4 ++--

 src/pcm/pcm_direct.h    |  2 +-

 src/pcm/pcm_dmix.c      |  8 ++++----

 src/pcm/pcm_dshare.c    |  8 ++++----

 src/pcm/pcm_dsnoop.c    |  4 ++--

 src/pcm/pcm_file.c      |  6 +++---

 src/pcm/pcm_generic.c   |  2 +-

 src/pcm/pcm_hooks.c     |  2 +-

 src/pcm/pcm_hw.c        |  1 -

 src/pcm/pcm_iec958.c    |  2 +-

 src/pcm/pcm_ioplug.c    |  9 ++++++---

 src/pcm/pcm_ladspa.c    |  2 +-

 src/pcm/pcm_lfloat.c    |  2 +-

 src/pcm/pcm_linear.c    |  2 +-

 src/pcm/pcm_local.h     | 45 +++++++++++++++++++++++++++++----------------

 src/pcm/pcm_meter.c     |  2 +-

 src/pcm/pcm_mmap_emul.c |  2 +-

 src/pcm/pcm_mulaw.c     |  2 +-

 src/pcm/pcm_multi.c     |  2 +-

 src/pcm/pcm_null.c      |  2 +-

 src/pcm/pcm_plug.c      |  2 +-

 src/pcm/pcm_rate.c      |  4 ++--

 src/pcm/pcm_route.c     |  2 +-

 src/pcm/pcm_share.c     |  6 +++---

 src/pcm/pcm_softvol.c   |  2 +-

 28 files changed, 73 insertions(+), 58 deletions(-)

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

index 6f0e7c4..1a83c5a 100644

--- a/src/pcm/pcm_adpcm.c

+++ b/src/pcm/pcm_adpcm.c

@@ -579,7 +579,7 @@ int snd_pcm_adpcm_open(snd_pcm_t **pcmp, const char *name, snd_pcm_format_t sfor

 	pcm->private_data = adpcm;

 	pcm->poll_fd = slave->poll_fd;

 	pcm->poll_events = slave->poll_events;

-	pcm->monotonic = slave->monotonic;

+	pcm->tstamp_type = slave->tstamp_type;

 	snd_pcm_set_hw_ptr(pcm, &adpcm->plug.hw_ptr, -1, 0);

 	snd_pcm_set_appl_ptr(pcm, &adpcm->plug.appl_ptr, -1, 0);

 	*pcmp = pcm;

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

index 1b1bab8..db759e3 100644

--- a/src/pcm/pcm_alaw.c

+++ b/src/pcm/pcm_alaw.c

@@ -453,7 +453,7 @@ int snd_pcm_alaw_open(snd_pcm_t **pcmp, const char *name, snd_pcm_format_t sform

 	pcm->private_data = alaw;

 	pcm->poll_fd = slave->poll_fd;

 	pcm->poll_events = slave->poll_events;

-	pcm->monotonic = slave->monotonic;

+	pcm->tstamp_type = slave->tstamp_type;

 	snd_pcm_set_hw_ptr(pcm, &alaw->plug.hw_ptr, -1, 0);

 	snd_pcm_set_appl_ptr(pcm, &alaw->plug.appl_ptr, -1, 0);

 	*pcmp = pcm;

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

index 56a1f6b..66d3a47 100644

--- a/src/pcm/pcm_copy.c

+++ b/src/pcm/pcm_copy.c

@@ -209,7 +209,7 @@ int snd_pcm_copy_open(snd_pcm_t **pcmp, const char *name, snd_pcm_t *slave, int

 	pcm->private_data = copy;

 	pcm->poll_fd = slave->poll_fd;

 	pcm->poll_events = slave->poll_events;

-	pcm->monotonic = slave->monotonic;

+	pcm->tstamp_type = slave->tstamp_type;

 	snd_pcm_set_hw_ptr(pcm, &copy->plug.hw_ptr, -1, 0);

 	snd_pcm_set_appl_ptr(pcm, &copy->plug.appl_ptr, -1, 0);

 	*pcmp = pcm;

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

index 5416cf7..8e37bcb 100644

--- a/src/pcm/pcm_direct.c

+++ b/src/pcm/pcm_direct.c

@@ -840,6 +840,7 @@ static void save_slave_setting(snd_pcm_direct_t *dmix, snd_pcm_t *spcm)

 	COPY_SLAVE(period_time);

 	COPY_SLAVE(periods);

 	COPY_SLAVE(tstamp_mode);

+	COPY_SLAVE(tstamp_type);

 	COPY_SLAVE(period_step);

 	COPY_SLAVE(avail_min);

 	COPY_SLAVE(start_threshold);

@@ -857,7 +858,6 @@ static void save_slave_setting(snd_pcm_direct_t *dmix, snd_pcm_t *spcm)

 	COPY_SLAVE(buffer_time);

 	COPY_SLAVE(sample_bits);

 	COPY_SLAVE(frame_bits);

-	COPY_SLAVE(monotonic);

 }

 #undef COPY_SLAVE

@@ -1204,6 +1204,7 @@ static void copy_slave_setting(snd_pcm_direct_t *dmix, snd_pcm_t *spcm)

 	COPY_SLAVE(period_time);

 	COPY_SLAVE(periods);

 	COPY_SLAVE(tstamp_mode);

+	COPY_SLAVE(tstamp_type);

 	COPY_SLAVE(period_step);

 	COPY_SLAVE(avail_min);

 	COPY_SLAVE(start_threshold);

@@ -1221,7 +1222,6 @@ static void copy_slave_setting(snd_pcm_direct_t *dmix, snd_pcm_t *spcm)

 	COPY_SLAVE(buffer_time);

 	COPY_SLAVE(sample_bits);

 	COPY_SLAVE(frame_bits);

-	COPY_SLAVE(monotonic);

 	spcm->info &= ~SND_PCM_INFO_PAUSE;

 	spcm->boundary = recalc_boundary_size(dmix->shmptr->s.boundary, spcm->buffer_size);

diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h

index 5ae39c0..9b1ddbc 100644

--- a/src/pcm/pcm_direct.h

+++ b/src/pcm/pcm_direct.h

@@ -85,8 +85,8 @@ typedef struct {

 		unsigned int period_size;

 		unsigned int period_time;

 		snd_interval_t periods;

-		unsigned int monotonic;