summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorDylan Reid <dgreid@chromium.org>2013-04-15 20:57:05 +0200
committerTakashi Iwai <tiwai@suse.de>2013-04-16 07:15:31 +0200
commitae03bbb8f93b9e2c85a58e7476b87f7fb1c063ab (patch)
tree47f4d7dcf31343bbd03c10606da3728da0dad37f /sound
parentMerge tag 'asoc-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff)
downloadlinux-ae03bbb8f93b9e2c85a58e7476b87f7fb1c063ab.tar.xz
linux-ae03bbb8f93b9e2c85a58e7476b87f7fb1c063ab.zip
ALSA: hda - Add codec delay to the capture time stamp.
For capture, the delay through the codec contributes to the time stamp of the sample recorded at the A to D. Rename the codec time stamp function appropriately. Signed-off-by: Dylan Reid <dgreid@chromium.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 63734b531f36..7b213d589ef6 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1889,7 +1889,7 @@ static void azx_timecounter_init(struct snd_pcm_substream *substream,
tc->cycle_last = last;
}
-static u64 azx_subtract_codec_delay(struct snd_pcm_substream *substream,
+static u64 azx_adjust_codec_delay(struct snd_pcm_substream *substream,
u64 nsec)
{
struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
@@ -1903,6 +1903,9 @@ static u64 azx_subtract_codec_delay(struct snd_pcm_substream *substream,
codec_nsecs = div_u64(codec_frames * 1000000000LL,
substream->runtime->rate);
+ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+ return nsec + codec_nsecs;
+
return (nsec > codec_nsecs) ? nsec - codec_nsecs : 0;
}
@@ -1914,7 +1917,7 @@ static int azx_get_wallclock_tstamp(struct snd_pcm_substream *substream,
nsec = timecounter_read(&azx_dev->azx_tc);
nsec = div_u64(nsec, 3); /* can be optimized */
- nsec = azx_subtract_codec_delay(substream, nsec);
+ nsec = azx_adjust_codec_delay(substream, nsec);
*ts = ns_to_timespec(nsec);