aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2015-02-06 16:55:51 -0500
committerTakashi Iwai <tiwai@suse.de>2015-02-09 10:01:53 -0500
commit2b79d7a6bf341ebeffb85fc2b3577d0cfa810c49 (patch)
tree164985dd74d92ed3563be5d52f656e1d7dd9444f /sound/core
parent0d59b814353d397ff5d00ac33acd536030252a98 (diff)
ALSA: pcm: allow for trigger_tstamp snapshot in .trigger
Don't use generic snapshot of trigger_tstamp if low-level driver or hardware can get a more precise value for better audio/system time synchronization. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/pcm_native.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 4ecd35fbfe3f..b03a638b420c 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -810,7 +810,8 @@ static void snd_pcm_trigger_tstamp(struct snd_pcm_substream *substream)
810 if (runtime->trigger_master == NULL) 810 if (runtime->trigger_master == NULL)
811 return; 811 return;
812 if (runtime->trigger_master == substream) { 812 if (runtime->trigger_master == substream) {
813 snd_pcm_gettime(runtime, &runtime->trigger_tstamp); 813 if (!runtime->trigger_tstamp_latched)
814 snd_pcm_gettime(runtime, &runtime->trigger_tstamp);
814 } else { 815 } else {
815 snd_pcm_trigger_tstamp(runtime->trigger_master); 816 snd_pcm_trigger_tstamp(runtime->trigger_master);
816 runtime->trigger_tstamp = runtime->trigger_master->runtime->trigger_tstamp; 817 runtime->trigger_tstamp = runtime->trigger_master->runtime->trigger_tstamp;
@@ -979,6 +980,7 @@ static int snd_pcm_pre_start(struct snd_pcm_substream *substream, int state)
979 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && 980 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
980 !snd_pcm_playback_data(substream)) 981 !snd_pcm_playback_data(substream))
981 return -EPIPE; 982 return -EPIPE;
983 runtime->trigger_tstamp_latched = false;
982 runtime->trigger_master = substream; 984 runtime->trigger_master = substream;
983 return 0; 985 return 0;
984} 986}