leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: usb-audio: support delay calculation on capture streams

Browse Source 
Enable delay report on capture path. The delay is reset when an
URB is retired and increment at each call to .pointer based
on frame counter changes. The precision of the delay
information is limited to 1ms as in the playback case.

This reverts commit 3f94fad095.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Pierre-Louis Bossart 2012-12-19 11:39:05 -06:00 committed by Takashi Iwai
parent a49f0d1ea3
commit e4cc615340
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/usb/pcm.c
View File

@ -59,7 +59,12 @@ snd_pcm_uframes_t snd_usb_pcm_delay(struct snd_usb_substream *subs,
/* Approximation based on number of samples per USB frame (ms), /* Approximation based on number of samples per USB frame (ms),
some truncation for 44.1 but the estimate is good enough */ some truncation for 44.1 but the estimate is good enough */
est_delay = subs->last_delay - (frame_diff * rate / 1000); est_delay = frame_diff * rate / 1000;
if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK)
est_delay = subs->last_delay - est_delay;
else
est_delay = subs->last_delay + est_delay;
if (est_delay < 0) if (est_delay < 0)
est_delay = 0; est_delay = 0;
return est_delay; return est_delay;
@ -78,8 +83,7 @@ static snd_pcm_uframes_t snd_usb_pcm_pointer(struct snd_pcm_substream *substream
return SNDRV_PCM_POS_XRUN; return SNDRV_PCM_POS_XRUN;
spin_lock(&subs->lock); spin_lock(&subs->lock);
hwptr_done = subs->hwptr_done; hwptr_done = subs->hwptr_done;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) substream->runtime->delay = snd_usb_pcm_delay(subs,
substream->runtime->delay = snd_usb_pcm_delay(subs,
substream->runtime->rate); substream->runtime->rate);
spin_unlock(&subs->lock); spin_unlock(&subs->lock);
return hwptr_done / (substream->runtime->frame_bits >> 3); return hwptr_done / (substream->runtime->frame_bits >> 3);
@ -1147,6 +1151,10 @@ static void retire_capture_urb(struct snd_usb_substream *subs,
int i, period_elapsed = 0; int i, period_elapsed = 0;
unsigned long flags; unsigned long flags;
unsigned char *cp; unsigned char *cp;
int current_frame_number;
/* read frame number here, update pointer in critical section */
current_frame_number = usb_get_current_frame_number(subs->dev);
stride = runtime->frame_bits >> 3; stride = runtime->frame_bits >> 3;
@ -1180,6 +1188,15 @@ static void retire_capture_urb(struct snd_usb_substream *subs,
subs->transfer_done -= runtime->period_size; subs->transfer_done -= runtime->period_size;
period_elapsed = 1; period_elapsed = 1;
} }
/* capture delay is by construction limited to one URB,
* reset delays here
*/
runtime->delay = subs->last_delay = 0;
/* realign last_frame_number */
subs->last_frame_number = current_frame_number;
subs->last_frame_number &= 0xFF; /* keep 8 LSBs */
spin_unlock_irqrestore(&subs->lock, flags); spin_unlock_irqrestore(&subs->lock, flags);
/* copy a data chunk */ /* copy a data chunk */
if (oldptr + bytes > runtime->buffer_size * stride) { if (oldptr + bytes > runtime->buffer_size * stride) {