- backport from upstream tree: * lots of patches to support the new chmap API * fix segfault in rate plugin error path * add a couple of test programs * fix inifinte loop in htimestamp of dmix & co OBS-URL: https://build.opensuse.org/request/show/138456 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=113
44 lines
1.1 KiB
Diff
44 lines
1.1 KiB
Diff
From 5a6ce315201f9e2abee51f4f890c1f5c6592c998 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Fri, 21 Sep 2012 17:59:42 +0200
|
|
Subject: [PATCH 27/30] PCM: Fix infinite loop in htimestamp of dmix, dsnoop
|
|
and dshare plugins
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_dmix.c | 1 +
|
|
src/pcm/pcm_dshare.c | 1 +
|
|
src/pcm/pcm_dsnoop.c | 1 +
|
|
3 files changed, 3 insertions(+)
|
|
|
|
--- a/src/pcm/pcm_dmix.c
|
|
+++ b/src/pcm/pcm_dmix.c
|
|
@@ -853,6 +853,7 @@ static int snd_pcm_dmix_htimestamp(snd_p
|
|
break;
|
|
*avail = avail1;
|
|
*tstamp = snd_pcm_hw_fast_tstamp(dmix->spcm);
|
|
+ ok = 1;
|
|
}
|
|
return 0;
|
|
}
|
|
--- a/src/pcm/pcm_dshare.c
|
|
+++ b/src/pcm/pcm_dshare.c
|
|
@@ -543,6 +543,7 @@ static int snd_pcm_dshare_htimestamp(snd
|
|
break;
|
|
*avail = avail1;
|
|
*tstamp = snd_pcm_hw_fast_tstamp(dshare->spcm);
|
|
+ ok = 1;
|
|
}
|
|
return 0;
|
|
}
|
|
--- a/src/pcm/pcm_dsnoop.c
|
|
+++ b/src/pcm/pcm_dsnoop.c
|
|
@@ -458,6 +458,7 @@ static int snd_pcm_dsnoop_htimestamp(snd
|
|
break;
|
|
*avail = avail1;
|
|
*tstamp = snd_pcm_hw_fast_tstamp(dsnoop->spcm);
|
|
+ ok = 1;
|
|
}
|
|
return 0;
|
|
}
|