Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv20441
Modified Files:
pcm_lib.c
Log Message:
Simplified snd_pcm_update_hw_ptr*() functions
Index: pcm_lib.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_lib.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pcm_lib.c 30 Sep 2003 09:28:26 -0000 1.44
+++ pcm_lib.c 6 Oct 2003 12:19:10 -0000 1.45
@@ -125,15 +125,11 @@
}
}
-static inline int snd_pcm_update_hw_ptr_interrupt(snd_pcm_substream_t *substream)
+static inline snd_pcm_uframes_t snd_pcm_update_hw_ptr_pos(snd_pcm_substream_t
*substream,
+ snd_pcm_runtime_t *runtime)
{
- snd_pcm_runtime_t *runtime = substream->runtime;
snd_pcm_uframes_t pos;
- snd_pcm_uframes_t old_hw_ptr, new_hw_ptr, hw_ptr_interrupt;
- snd_pcm_uframes_t avail;
- snd_pcm_sframes_t delta;
- old_hw_ptr = runtime->status->hw_ptr;
pos = substream->ops->pointer(substream);
if (runtime->tstamp_mode & SNDRV_PCM_TSTAMP_MMAP)
snd_timestamp_now((snd_timestamp_t*)&runtime->status->tstamp,
runtime->tstamp_timespec);
@@ -143,16 +139,47 @@
} else
#endif
snd_runtime_check(pos < runtime->buffer_size, return 0);
-
pos -= pos % runtime->min_align;
- new_hw_ptr = runtime->hw_ptr_base + pos;
+ return pos;
+}
+
+static inline int snd_pcm_update_hw_ptr_post(snd_pcm_substream_t *substream,
+ snd_pcm_runtime_t *runtime)
+{
+ snd_pcm_uframes_t avail;
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ avail = snd_pcm_playback_avail(runtime);
+ else
+ avail = snd_pcm_capture_avail(runtime);
+ if (avail > runtime->avail_max)
+ runtime->avail_max = avail;
+ if (avail >= runtime->stop_threshold) {
+ snd_pcm_stop(substream,
+ runtime->status->state == SNDRV_PCM_STATE_DRAINING ?
+ SNDRV_PCM_STATE_SETUP : SNDRV_PCM_STATE_XRUN);
+ return -EPIPE;
+ }
+ if (avail >= runtime->control->avail_min)
+ wake_up(&runtime->sleep);
+ return 0;
+}
+
+static inline int snd_pcm_update_hw_ptr_interrupt(snd_pcm_substream_t *substream)
+{
+ snd_pcm_runtime_t *runtime = substream->runtime;
+ snd_pcm_uframes_t pos;
+ snd_pcm_uframes_t new_hw_ptr, hw_ptr_interrupt;
+ snd_pcm_sframes_t delta;
+
+ pos = snd_pcm_update_hw_ptr_pos(substream, runtime);
+ new_hw_ptr = runtime->hw_ptr_base + pos;
hw_ptr_interrupt = runtime->hw_ptr_interrupt + runtime->period_size;
delta = hw_ptr_interrupt - new_hw_ptr;
if (delta > 0) {
if ((snd_pcm_uframes_t)delta < runtime->buffer_size / 2) {
- snd_printd("Unexpected hw_pointer value (stream = %i, delta:
-%ld, max jitter = %ld): wrong interrupt acknowledge?\n", substream->stream, (long)
delta, runtime->buffer_size / 2);
+ snd_printd(KERN_ERR "Unexpected hw_pointer value (stream = %i,
delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n", substream->stream,
(long) delta, runtime->buffer_size / 2);
return 0;
}
runtime->hw_ptr_base += runtime->buffer_size;
@@ -168,21 +195,7 @@
runtime->status->hw_ptr = new_hw_ptr;
runtime->hw_ptr_interrupt = new_hw_ptr - new_hw_ptr % runtime->period_size;
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
- avail = snd_pcm_playback_avail(runtime);
- else
- avail = snd_pcm_capture_avail(runtime);
- if (avail > runtime->avail_max)
- runtime->avail_max = avail;
- if (avail >= runtime->stop_threshold) {
- snd_pcm_stop(substream,
- runtime->status->state == SNDRV_PCM_STATE_DRAINING ?
- SNDRV_PCM_STATE_SETUP : SNDRV_PCM_STATE_XRUN);
- return -EPIPE;
- }
- if (avail >= runtime->control->avail_min)
- wake_up(&runtime->sleep);
- return 0;
+ return snd_pcm_update_hw_ptr_post(substream, runtime);
}
/* CAUTION: call it with irq disabled */
@@ -191,27 +204,16 @@
snd_pcm_runtime_t *runtime = substream->runtime;
snd_pcm_uframes_t pos;
snd_pcm_uframes_t old_hw_ptr, new_hw_ptr;
- snd_pcm_uframes_t avail;
snd_pcm_sframes_t delta;
old_hw_ptr = runtime->status->hw_ptr;
- pos = substream->ops->pointer(substream);
- if (runtime->tstamp_mode & SNDRV_PCM_TSTAMP_MMAP)
- snd_timestamp_now((snd_timestamp_t*)&runtime->status->tstamp,
runtime->tstamp_timespec);
-#ifdef CONFIG_SND_DEBUG
- if (pos >= runtime->buffer_size) {
- snd_printk(KERN_ERR "BUG: stream = %i, pos = 0x%lx, buffer size =
0x%lx, period size = 0x%lx\n", substream->stream, pos, runtime->buffer_size,
runtime->period_size);
- } else
-#endif
- snd_runtime_check(pos < runtime->buffer_size, return 0);
-
- pos -= pos % runtime->min_align;
+ pos = snd_pcm_update_hw_ptr_pos(substream, runtime);
new_hw_ptr = runtime->hw_ptr_base + pos;
delta = old_hw_ptr - new_hw_ptr;
if (delta > 0) {
if ((snd_pcm_uframes_t)delta < runtime->buffer_size / 2) {
- snd_printd("Unexpected hw_pointer value (stream = %i, delta:
-%ld, max jitter = %ld): wrong interrupt acknowledge?\n", substream->stream, (long)
delta, runtime->buffer_size / 2);
+ snd_printd(KERN_ERR "Unexpected hw_pointer value (stream = %i,
delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n", substream->stream,
(long) delta, runtime->buffer_size / 2);
return 0;
}
runtime->hw_ptr_base += runtime->buffer_size;
@@ -222,23 +224,10 @@
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
runtime->silence_size > 0)
snd_pcm_playback_silence(substream, new_hw_ptr);
+
runtime->status->hw_ptr = new_hw_ptr;
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
- avail = snd_pcm_playback_avail(runtime);
- else
- avail = snd_pcm_capture_avail(runtime);
- if (avail > runtime->avail_max)
- runtime->avail_max = avail;
- if (avail >= runtime->stop_threshold) {
- snd_pcm_stop(substream,
- runtime->status->state == SNDRV_PCM_STATE_DRAINING ?
- SNDRV_PCM_STATE_SETUP : SNDRV_PCM_STATE_XRUN);
- return -EPIPE;
- }
- if (avail >= runtime->control->avail_min)
- wake_up(&runtime->sleep);
- return 0;
+ return snd_pcm_update_hw_ptr_post(substream, runtime);
}
/**
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
