Takashi Iwai
6e2e452dec
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=67
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From ba9332e9192814a5431a3a2505d25d74a9232124 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Thu, 18 Nov 2010 09:27:07 +0100
|
|
Subject: [PATCH 07/10] pcm: fix snd_pcm_avail_delay() function
|
|
|
|
For capture stream, the delay must be obtained as last, but we need to
|
|
update the ring buffer pointers for the avail_update call. So, rearrange
|
|
the code a bit and add hwsync call as first.
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/pcm/pcm.c | 10 +++++++---
|
|
1 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
|
|
index f378779..7409943 100644
|
|
--- a/src/pcm/pcm.c
|
|
+++ b/src/pcm/pcm.c
|
|
@@ -2470,18 +2470,22 @@ int snd_pcm_avail_delay(snd_pcm_t *pcm,
|
|
snd_pcm_sframes_t *delayp)
|
|
{
|
|
snd_pcm_sframes_t sf;
|
|
+ int err;
|
|
|
|
assert(pcm && availp && delayp);
|
|
if (CHECK_SANITY(! pcm->setup)) {
|
|
SNDMSG("PCM not set up");
|
|
return -EIO;
|
|
}
|
|
- sf = pcm->fast_ops->delay(pcm->fast_op_arg, delayp);
|
|
- if (sf < 0)
|
|
- return (int)sf;
|
|
+ err = pcm->fast_ops->hwsync(pcm->fast_op_arg);
|
|
+ if (err < 0)
|
|
+ return err;
|
|
sf = pcm->fast_ops->avail_update(pcm->fast_op_arg);
|
|
if (sf < 0)
|
|
return (int)sf;
|
|
+ err = pcm->fast_ops->delay(pcm->fast_op_arg, delayp);
|
|
+ if (err < 0)
|
|
+ return err;
|
|
*availp = sf;
|
|
return 0;
|
|
}
|
|
--
|
|
1.7.3.1
|
|
|