Commit ded652f7 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: pcm - Fix delta calculation at boundary overlap

When the hw_ptr_interrupt reaches the boundary, it must check whether
the hw_base was already lapped and corret the delta value appropriately.

Also, rebasing the hw_ptr needs a correction because buffer_size isn't
always aligned to period_size.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 5f513e11
...@@ -221,8 +221,11 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) ...@@ -221,8 +221,11 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
new_hw_ptr = hw_base + pos; new_hw_ptr = hw_base + pos;
hw_ptr_interrupt = runtime->hw_ptr_interrupt + runtime->period_size; hw_ptr_interrupt = runtime->hw_ptr_interrupt + runtime->period_size;
delta = new_hw_ptr - hw_ptr_interrupt; delta = new_hw_ptr - hw_ptr_interrupt;
if (hw_ptr_interrupt == runtime->boundary) if (hw_ptr_interrupt >= runtime->boundary) {
hw_ptr_interrupt = 0; hw_ptr_interrupt %= runtime->boundary;
if (!hw_base) /* hw_base was already lapped; recalc delta */
delta = new_hw_ptr - hw_ptr_interrupt;
}
if (delta < 0) { if (delta < 0) {
delta += runtime->buffer_size; delta += runtime->buffer_size;
if (delta < 0) { if (delta < 0) {
...@@ -233,6 +236,8 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream) ...@@ -233,6 +236,8 @@ static int snd_pcm_update_hw_ptr_interrupt(struct snd_pcm_substream *substream)
(long)hw_ptr_interrupt); (long)hw_ptr_interrupt);
/* rebase to interrupt position */ /* rebase to interrupt position */
hw_base = new_hw_ptr = hw_ptr_interrupt; hw_base = new_hw_ptr = hw_ptr_interrupt;
/* align hw_base to buffer_size */
hw_base -= hw_base % runtime->buffer_size;
delta = 0; delta = 0;
} else { } else {
hw_base += runtime->buffer_size; hw_base += runtime->buffer_size;
......
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