d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Underruns counting logic should be based on bufhard free space

Browse Source 
and must be done after sndbuf_feed(), or any attempt to fill
up bufhard. This should fix false underruns counter.
This commit is contained in:
Ariff Abdullah 2005-12-30 07:33:01 +00:00
parent 111a16a8ee
commit 764907327e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=153868
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/dev/sound/pcm/channel.c
View File

@ -245,28 +245,12 @@ chn_wrfeed(struct pcm_channel *c)
("%s(%s): amt %d > source size %d, flags 0x%x", __func__, c->name,
amt, sndbuf_getsize(bs), c->flags));
if (SLIST_EMPTY(&c->children)) {
/*
* Hardware channel
*/
if (sndbuf_getready(bs) < amt)
c->xruns++;
ret = (amt > 0) ? sndbuf_feed(bs, b, c, c->feeder, amt) : ENOSPC;
} else {
/*
* vchan
*/
if (amt > 0) {
ret = sndbuf_feed(bs, b, c, c->feeder, amt);
/*
* Possible vchan xruns. There should be no empty space
* left in buffer.
*/
if (sndbuf_getfree(b) > 0)
c->xruns++;
} else
ret = ENOSPC;
}
ret = (amt > 0) ? sndbuf_feed(bs, b, c, c->feeder, amt) : ENOSPC;
/*
* Possible xruns. There should be no empty space left in buffer.
*/
if (sndbuf_getfree(b) > 0)
c->xruns++;
if (ret == 0 && sndbuf_getfree(b) < amt)
chn_wakeup(c);