Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If one or more playback filters are applied, minimize loading 

size of the hardware buffer to improve accuracy of AUDIO_GETIOFFS.
This commit is contained in:
kent 2006-05-16 13:46:19 +00:00
parent 52677b4154
commit e47609747e
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/audio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: audio.c,v 1.205 2006/05/10 01:56:21 kent Exp $ */ /* $NetBSD: audio.c,v 1.206 2006/05/16 13:46:19 kent Exp $ */
/* /*
* Copyright (c) 1991-1993 Regents of the University of California. * Copyright (c) 1991-1993 Regents of the University of California.
@ -61,7 +61,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.205 2006/05/10 01:56:21 kent Exp $"); __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.206 2006/05/16 13:46:19 kent Exp $");
#include "audio.h" #include "audio.h"
#if NAUDIO > 0 #if NAUDIO > 0
@ -1907,7 +1907,7 @@ audio_write(struct audio_softc *sc, struct uio *uio, int ioflag)
splx(s); splx(s);
/* /*
* write to the cb as much as possible * write to the sc_pustream as much as possible
* *
* work with a temporary audio_stream_t to narrow * work with a temporary audio_stream_t to narrow
* splaudio() enclosure * splaudio() enclosure
@ -1918,15 +1918,19 @@ audio_write(struct audio_softc *sc, struct uio *uio, int ioflag)
if (sc->sc_npfilters > 0) { if (sc->sc_npfilters > 0) {
filter = sc->sc_pfilters[0]; filter = sc->sc_pfilters[0];
filter->set_fetcher(filter, &ufetcher.base); filter->set_fetcher(filter, &ufetcher.base);
}
cc = stream.end - stream.start;
if (sc->sc_npfilters > 0) {
fetcher = &sc->sc_pfilters[sc->sc_npfilters - 1]->base; fetcher = &sc->sc_pfilters[sc->sc_npfilters - 1]->base;
cc = cb->blksize * 2;
error = fetcher->fetch_to(fetcher, &stream, cc);
if (error != 0) {
fetcher = &ufetcher.base;
cc = sc->sc_pustream->end - sc->sc_pustream->start;
error = fetcher->fetch_to(fetcher, sc->sc_pustream, cc);
}
} else { } else {
fetcher = &ufetcher.base; fetcher = &ufetcher.base;
cc = stream.end - stream.start;
error = fetcher->fetch_to(fetcher, &stream, cc);
} }
error = fetcher->fetch_to(fetcher, &stream, cc);
sc->sc_writing = 0; sc->sc_writing = 0;
if (sc->sc_waitcomp) if (sc->sc_waitcomp)
wakeup(sc); wakeup(sc);
@ -2556,6 +2560,8 @@ audio_pint(void *v)
&null_fetcher); &null_fetcher);
used = audio_stream_get_used(sc->sc_pustream); used = audio_stream_get_used(sc->sc_pustream);
cc = cb->s.end - cb->s.start; cc = cb->s.end - cb->s.start;
if (blksize * 2 < cc)
cc = blksize * 2;
fetcher->fetch_to(fetcher, &cb->s, cc); fetcher->fetch_to(fetcher, &cb->s, cc);
cb->fstamp += used - audio_stream_get_used(sc->sc_pustream); cb->fstamp += used - audio_stream_get_used(sc->sc_pustream);
used = audio_stream_get_used(&cb->s); used = audio_stream_get_used(&cb->s);