Commit 5646eda5 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: pcm: Add timestamp type to sw_params

For allowing adjusting the timestamp type on the fly, add it to
sw_params.  The existing ioctl is still kept for compatibility.

Along with this, increment the PCM protocol version.

The extension was suggested by Clemens Ladisch.
Acked-by: default avatarJaroslav Kysela <perex@perex.cz>
Reviewed-by: default avatarMark Brown <broonie@linaro.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0ac8a52d
...@@ -139,7 +139,7 @@ struct snd_hwdep_dsp_image { ...@@ -139,7 +139,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 unsigned long snd_pcm_uframes_t;
typedef signed long snd_pcm_sframes_t; typedef signed long snd_pcm_sframes_t;
...@@ -391,7 +391,9 @@ struct snd_pcm_sw_params { ...@@ -391,7 +391,9 @@ struct snd_pcm_sw_params {
snd_pcm_uframes_t silence_threshold; /* min distance from noise for silence filling */ 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 silence_size; /* silence block size */
snd_pcm_uframes_t boundary; /* pointers wrap point */ 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 { struct snd_pcm_channel_info {
......
...@@ -543,6 +543,8 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream, ...@@ -543,6 +543,8 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream,
if (params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST) if (params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST)
return -EINVAL; return -EINVAL;
if (params->tstamp_type > SNDRV_PCM_TSTAMP_TYPE_LAST)
return -EINVAL;
if (params->avail_min == 0) if (params->avail_min == 0)
return -EINVAL; return -EINVAL;
if (params->silence_size >= runtime->boundary) { if (params->silence_size >= runtime->boundary) {
...@@ -557,6 +559,7 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream, ...@@ -557,6 +559,7 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream,
err = 0; err = 0;
snd_pcm_stream_lock_irq(substream); snd_pcm_stream_lock_irq(substream);
runtime->tstamp_mode = params->tstamp_mode; runtime->tstamp_mode = params->tstamp_mode;
runtime->tstamp_type = params->tstamp_type;
runtime->period_step = params->period_step; runtime->period_step = params->period_step;
runtime->control->avail_min = params->avail_min; runtime->control->avail_min = params->avail_min;
runtime->start_threshold = params->start_threshold; runtime->start_threshold = params->start_threshold;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment