2005-01-06 01:43:34 +00:00
|
|
|
/*-
|
2003-09-07 16:28:03 +00:00
|
|
|
* Copyright (c) 1999 Cameron Grant <cg@freebsd.org>
|
1999-09-01 04:08:39 +00:00
|
|
|
* Portions Copyright by Luigi Rizzo - 1997-99
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
2005-06-10 21:33:14 +00:00
|
|
|
#include "opt_isa.h"
|
|
|
|
|
1999-11-20 16:50:33 +00:00
|
|
|
#include <dev/sound/pcm/sound.h>
|
1999-09-01 04:08:39 +00:00
|
|
|
|
2000-12-18 01:36:41 +00:00
|
|
|
#include "feeder_if.h"
|
|
|
|
|
2001-08-23 11:30:52 +00:00
|
|
|
SND_DECLARE_FILE("$FreeBSD$");
|
|
|
|
|
1999-09-01 04:08:39 +00:00
|
|
|
#define MIN_CHUNK_SIZE 256 /* for uiomove etc. */
|
|
|
|
#define DMA_ALIGN_THRESHOLD 4
|
|
|
|
#define DMA_ALIGN_MASK (~(DMA_ALIGN_THRESHOLD - 1))
|
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
#define CANCHANGE(c) (!(c->flags & CHN_F_TRIGGERED))
|
2000-11-07 00:32:35 +00:00
|
|
|
|
1999-12-29 03:46:54 +00:00
|
|
|
/*
|
|
|
|
#define DEB(x) x
|
|
|
|
*/
|
2000-11-07 00:32:35 +00:00
|
|
|
|
2001-09-18 14:45:09 +00:00
|
|
|
static int chn_targetirqrate = 32;
|
|
|
|
TUNABLE_INT("hw.snd.targetirqrate", &chn_targetirqrate);
|
|
|
|
|
|
|
|
static int
|
|
|
|
sysctl_hw_snd_targetirqrate(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
|
|
|
int err, val;
|
|
|
|
|
|
|
|
val = chn_targetirqrate;
|
|
|
|
err = sysctl_handle_int(oidp, &val, sizeof(val), req);
|
|
|
|
if (val < 16 || val > 512)
|
|
|
|
err = EINVAL;
|
|
|
|
else
|
|
|
|
chn_targetirqrate = val;
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
SYSCTL_PROC(_hw_snd, OID_AUTO, targetirqrate, CTLTYPE_INT | CTLFLAG_RW,
|
2002-02-24 00:49:43 +00:00
|
|
|
0, sizeof(int), sysctl_hw_snd_targetirqrate, "I", "");
|
|
|
|
static int report_soft_formats = 1;
|
|
|
|
SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW,
|
|
|
|
&report_soft_formats, 1, "report software-emulated formats");
|
2001-09-18 14:45:09 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
static int chn_buildfeeder(struct pcm_channel *c);
|
2001-02-07 20:45:40 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
static void
|
2003-12-05 02:08:13 +00:00
|
|
|
chn_lockinit(struct pcm_channel *c, int dir)
|
2001-03-24 23:10:29 +00:00
|
|
|
{
|
2004-02-28 19:47:02 +00:00
|
|
|
switch(dir) {
|
|
|
|
case PCMDIR_PLAY:
|
|
|
|
c->lock = snd_mtxcreate(c->name, "pcm play channel");
|
|
|
|
break;
|
|
|
|
case PCMDIR_REC:
|
|
|
|
c->lock = snd_mtxcreate(c->name, "pcm record channel");
|
|
|
|
break;
|
|
|
|
case PCMDIR_VIRTUAL:
|
|
|
|
c->lock = snd_mtxcreate(c->name, "pcm virtual play channel");
|
|
|
|
break;
|
|
|
|
case 0:
|
|
|
|
c->lock = snd_mtxcreate(c->name, "pcm fake channel");
|
|
|
|
break;
|
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
}
|
2001-02-07 20:45:40 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
static void
|
|
|
|
chn_lockdestroy(struct pcm_channel *c)
|
|
|
|
{
|
|
|
|
snd_mtxfree(c->lock);
|
|
|
|
}
|
2001-02-07 20:45:40 +00:00
|
|
|
|
1999-09-01 04:08:39 +00:00
|
|
|
static int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_polltrigger(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
|
|
|
unsigned amt, lim;
|
1999-09-01 04:08:39 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
|
|
|
if (c->flags & CHN_F_MAPPED) {
|
|
|
|
if (sndbuf_getprevblocks(bs) == 0)
|
|
|
|
return 1;
|
2001-03-25 21:43:24 +00:00
|
|
|
else
|
2001-03-24 23:10:29 +00:00
|
|
|
return (sndbuf_getblocks(bs) > sndbuf_getprevblocks(bs))? 1 : 0;
|
|
|
|
} else {
|
|
|
|
amt = (c->direction == PCMDIR_PLAY)? sndbuf_getfree(bs) : sndbuf_getready(bs);
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
#if 0
|
2001-03-24 23:10:29 +00:00
|
|
|
lim = (c->flags & CHN_F_HAS_SIZE)? sndbuf_getblksz(bs) : 1;
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
#endif
|
2001-03-24 23:10:29 +00:00
|
|
|
lim = 1;
|
|
|
|
return (amt >= lim)? 1 : 0;
|
|
|
|
}
|
|
|
|
return 0;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_pollreset(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
1999-09-01 04:08:39 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
|
|
|
sndbuf_updateprevtotal(bs);
|
1999-09-01 04:08:39 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_wakeup(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2004-02-19 01:07:15 +00:00
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
|
|
|
struct pcmchan_children *pce;
|
1999-09-01 04:08:39 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
2004-02-19 01:07:15 +00:00
|
|
|
if (SLIST_EMPTY(&c->children)) {
|
|
|
|
if (SEL_WAITING(sndbuf_getsel(bs)) && chn_polltrigger(c))
|
2004-02-20 01:24:57 +00:00
|
|
|
selwakeuppri(sndbuf_getsel(bs), PRIBIO);
|
2004-02-19 01:07:15 +00:00
|
|
|
} else {
|
|
|
|
SLIST_FOREACH(pce, &c->children, link) {
|
|
|
|
CHN_LOCK(pce->channel);
|
|
|
|
chn_wakeup(pce->channel);
|
|
|
|
CHN_UNLOCK(pce->channel);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
wakeup(bs);
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
static int
|
|
|
|
chn_sleep(struct pcm_channel *c, char *str, int timeout)
|
1999-12-13 03:29:09 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
CHN_LOCKASSERT(c);
|
2001-06-23 17:36:51 +00:00
|
|
|
#ifdef USING_MUTEX
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = msleep(bs, c->lock, PRIBIO | PCATCH, str, timeout);
|
2001-06-23 17:36:51 +00:00
|
|
|
#else
|
|
|
|
ret = tsleep(bs, PRIBIO | PCATCH, str, timeout);
|
|
|
|
#endif
|
2001-02-07 06:48:28 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
return ret;
|
1999-12-13 03:29:09 +00:00
|
|
|
}
|
|
|
|
|
1999-09-01 04:08:39 +00:00
|
|
|
/*
|
|
|
|
* chn_dmaupdate() tracks the status of a dma transfer,
|
2005-10-02 15:37:40 +00:00
|
|
|
* updating pointers.
|
1999-09-01 04:08:39 +00:00
|
|
|
*/
|
1999-12-05 19:09:13 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
static unsigned int
|
|
|
|
chn_dmaupdate(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
unsigned int delta, old, hwptr, amt;
|
1999-09-01 04:08:39 +00:00
|
|
|
|
2001-05-27 17:22:00 +00:00
|
|
|
KASSERT(sndbuf_getsize(b) > 0, ("bufsize == 0"));
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
2001-12-21 22:34:01 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
old = sndbuf_gethwptr(b);
|
1999-12-05 19:09:13 +00:00
|
|
|
hwptr = chn_getptr(c);
|
2001-03-24 23:10:29 +00:00
|
|
|
delta = (sndbuf_getsize(b) + hwptr - old) % sndbuf_getsize(b);
|
|
|
|
sndbuf_sethwptr(b, hwptr);
|
|
|
|
|
2001-02-07 06:48:28 +00:00
|
|
|
DEB(
|
2001-03-24 23:10:29 +00:00
|
|
|
if (delta >= ((sndbuf_getsize(b) * 15) / 16)) {
|
2000-08-09 00:42:00 +00:00
|
|
|
if (!(c->flags & (CHN_F_CLOSING | CHN_F_ABORTING)))
|
2002-01-25 04:14:12 +00:00
|
|
|
device_printf(c->dev, "hwptr went backwards %d -> %d\n", old, hwptr);
|
2000-08-09 00:42:00 +00:00
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
);
|
2001-02-07 20:45:40 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
if (c->direction == PCMDIR_PLAY) {
|
|
|
|
amt = MIN(delta, sndbuf_getready(b));
|
|
|
|
if (amt > 0)
|
|
|
|
sndbuf_dispose(b, NULL, amt);
|
1999-09-01 04:08:39 +00:00
|
|
|
} else {
|
2001-03-24 23:10:29 +00:00
|
|
|
amt = MIN(delta, sndbuf_getfree(b));
|
|
|
|
if (amt > 0)
|
|
|
|
sndbuf_acquire(b, NULL, amt);
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
|
|
|
|
return delta;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
1999-12-29 03:46:54 +00:00
|
|
|
void
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_wrupdate(struct pcm_channel *c)
|
1999-12-05 19:09:13 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
int ret;
|
1999-12-05 19:09:13 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
|
|
|
KASSERT(c->direction == PCMDIR_PLAY, ("chn_wrupdate on bad channel"));
|
|
|
|
|
2001-06-07 20:06:22 +00:00
|
|
|
if ((c->flags & (CHN_F_MAPPED | CHN_F_VIRTUAL)) || !(c->flags & CHN_F_TRIGGERED))
|
2001-03-24 23:10:29 +00:00
|
|
|
return;
|
|
|
|
chn_dmaupdate(c);
|
|
|
|
ret = chn_wrfeed(c);
|
|
|
|
/* tell the driver we've updated the primary buffer */
|
|
|
|
chn_trigger(c, PCMTRIG_EMLDMAWR);
|
|
|
|
DEB(if (ret)
|
|
|
|
printf("chn_wrupdate: chn_wrfeed returned %d\n", ret);)
|
1999-12-13 03:29:09 +00:00
|
|
|
|
2001-02-07 20:45:40 +00:00
|
|
|
}
|
1999-12-13 03:29:09 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
int
|
|
|
|
chn_wrfeed(struct pcm_channel *c)
|
|
|
|
{
|
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
|
|
|
unsigned int ret, amt;
|
|
|
|
|
|
|
|
CHN_LOCKASSERT(c);
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
#if 0
|
|
|
|
DEB(
|
2001-03-24 23:10:29 +00:00
|
|
|
if (c->flags & CHN_F_CLOSING) {
|
|
|
|
sndbuf_dump(b, "b", 0x02);
|
|
|
|
sndbuf_dump(bs, "bs", 0x02);
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
})
|
|
|
|
#endif
|
2001-03-24 23:10:29 +00:00
|
|
|
|
2001-12-21 22:34:01 +00:00
|
|
|
if (c->flags & CHN_F_MAPPED)
|
|
|
|
sndbuf_acquire(bs, NULL, sndbuf_getfree(bs));
|
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
amt = sndbuf_getfree(b);
|
2004-01-28 08:02:15 +00:00
|
|
|
KASSERT(amt <= sndbuf_getsize(bs),
|
|
|
|
("%s(%s): amt %d > source size %d, flags 0x%x", __func__, c->name,
|
|
|
|
amt, sndbuf_getsize(bs), c->flags));
|
2001-12-21 22:34:01 +00:00
|
|
|
|
2005-12-30 07:33:01 +00:00
|
|
|
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++;
|
Whats New:
1. Support wide range sampling rate, as low as 1hz up to int32 max
(which is, insane) through new feeder_rate, multiple precisions
choice (32/64 bit converter). This is indeed, quite insane, but it
does give us more room and flexibility. Plenty sysctl options to
adjust resampling characteristics.
2. Support 24/32 bit pcm format conversion through new, much improved,
simplified and optimized feeder_fmt.
Changes:
1. buffer.c / dsp.c / sound.h
* Support for 24/32 AFMT.
2. feeder_rate.c
* New implementation of sampling rate conversion with 32/64 bit
precision, 1 - int32max hz (which is, ridiculous, yet very
addictive). Much improved / smarter buffer management to not
cause any missing samples at the end of conversion process
* Tunable sysctls for various aspect:
hw.snd.feeder_rate_ratemin - minimum allowable sampling rate
(default to 4000)
hw.snd.feeder_rate_ratemax - maximum allowable sampling rate
(default to 1102500)
hw.snd.feeder_rate_buffersize - conversion buffer size
(default to 8192)
hw.snd.feeder_rate_scaling - scaling / conversion method
(please refer to the source for explaination). Default to
previous implementation type.
3. feeder_fmt.c / sound.h
* New implementation, support for 24/32bit conversion, optimized,
and simplified. Few routines has been removed (8 to xlaw, 16 to
8). It just doesn't make sense.
4. channel.c
* Support for 24/32 AFMT
* Fix wrong xruns increment, causing incorrect underruns statistic
while using vchans.
5. vchan.c
* Support for 24/32 AFMT
* Proper speed / rate detection especially for fixed rate ac97.
User can override it using kernel hint:
hint.pcm.<unit>.vchanrate="xxxx".
Notes / Issues:
* Virtual Channels (vchans)
Enabling vchans can really, really help to solve overrun
issues. This is quite understandable, because it operates
entirely within its own buffering system without relying on
hardware interrupt / state. Even if you don't need vchan,
just enable single channel can help much. Few soundcards
(notably via8233x, sblive, possibly others) have their own
hardware multi channel, and this is unfortunately beyond
vchan reachability.
* The arrival of 24/32 also come with a price. Applications
that can do 24/32bit playback need to be recompiled (notably
mplayer). Use (recompiled) mplayer to experiment / test /
debug this various format using -af format=fmt. Note that
24bit seeking in mplayer is a little bit broken, sometimes
can cause silence or loud static noise. Pausing / seeking
few times can solve this problem.
You don't have to rebuild world entirely for this. Simply
copy /usr/src/sys/sys/soundcard.h to
/usr/include/sys/soundcard.h would suffice. Few drivers also
need recompilation, and this can be done via
/usr/src/sys/modules/sound/.
Support for 24bit hardware playback is beyond the scope of
this changes. That would require spessific hardware driver
changes.
* Don't expect playing 9999999999hz is a wise decision. Be
reasonable. The new feeder_rate implemention provide
flexibility, not insanity. You can easily chew up your CPU
with this kind of mind instability. Please use proper
mosquito repellent device for this obvious cracked brain
attempt. As for testing purposes, you can use (again)
mplayer to generate / play with different sampling rate. Use
something like "mplayer -af resample=192000:0:0 <files>".
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
Tested by: multimedia@
2005-07-31 16:16:22 +00:00
|
|
|
|
2001-04-08 20:20:52 +00:00
|
|
|
if (ret == 0 && sndbuf_getfree(b) < amt)
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_wakeup(c);
|
2001-12-21 22:34:01 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
return ret;
|
1999-12-13 03:29:09 +00:00
|
|
|
}
|
|
|
|
|
1999-09-01 04:08:39 +00:00
|
|
|
static void
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_wrintr(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
int ret;
|
2001-02-07 20:45:40 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
|
|
|
/* update pointers in primary buffer */
|
2001-03-25 21:43:24 +00:00
|
|
|
chn_dmaupdate(c);
|
2001-03-24 23:10:29 +00:00
|
|
|
/* ...and feed from secondary to primary */
|
|
|
|
ret = chn_wrfeed(c);
|
|
|
|
/* tell the driver we've updated the primary buffer */
|
2001-03-25 21:43:24 +00:00
|
|
|
chn_trigger(c, PCMTRIG_EMLDMAWR);
|
2001-03-24 23:10:29 +00:00
|
|
|
DEB(if (ret)
|
|
|
|
printf("chn_wrintr: chn_wrfeed returned %d\n", ret);)
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2001-08-29 02:49:54 +00:00
|
|
|
* user write routine - uiomove data into secondary buffer, trigger if necessary
|
2001-03-24 23:10:29 +00:00
|
|
|
* if blocking, sleep, rinse and repeat.
|
1999-09-01 04:08:39 +00:00
|
|
|
*
|
2001-03-24 23:10:29 +00:00
|
|
|
* called externally, so must handle locking
|
1999-09-01 04:08:39 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_write(struct pcm_channel *c, struct uio *buf)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
int ret, timeout, newsize, count, sz;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
2003-11-27 19:51:44 +00:00
|
|
|
void *off;
|
|
|
|
int t, x,togo,p;
|
1999-12-29 03:46:54 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
1999-12-29 03:46:54 +00:00
|
|
|
/*
|
|
|
|
* XXX Certain applications attempt to write larger size
|
|
|
|
* of pcm data than c->blocksize2nd without blocking,
|
|
|
|
* resulting partial write. Expand the block size so that
|
|
|
|
* the write operation avoids blocking.
|
|
|
|
*/
|
2001-03-24 23:10:29 +00:00
|
|
|
if ((c->flags & CHN_F_NBIO) && buf->uio_resid > sndbuf_getblksz(bs)) {
|
2002-01-25 04:14:12 +00:00
|
|
|
DEB(device_printf(c->dev, "broken app, nbio and tried to write %d bytes with fragsz %d\n",
|
2001-03-24 23:10:29 +00:00
|
|
|
buf->uio_resid, sndbuf_getblksz(bs)));
|
2000-04-15 05:04:12 +00:00
|
|
|
newsize = 16;
|
2000-04-23 18:09:18 +00:00
|
|
|
while (newsize < min(buf->uio_resid, CHN_2NDBUFMAXSIZE / 2))
|
2000-04-15 05:04:12 +00:00
|
|
|
newsize <<= 1;
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_setblocksize(c, sndbuf_getblkcnt(bs), newsize);
|
2002-01-25 04:14:12 +00:00
|
|
|
DEB(device_printf(c->dev, "frags reset to %d x %d\n", sndbuf_getblkcnt(bs), sndbuf_getblksz(bs)));
|
1999-12-29 03:46:54 +00:00
|
|
|
}
|
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = 0;
|
2001-03-25 21:43:24 +00:00
|
|
|
count = hz;
|
2001-03-24 23:10:29 +00:00
|
|
|
while (!ret && (buf->uio_resid > 0) && (count > 0)) {
|
|
|
|
sz = sndbuf_getfree(bs);
|
|
|
|
if (sz == 0) {
|
|
|
|
if (c->flags & CHN_F_NBIO)
|
|
|
|
ret = EWOULDBLOCK;
|
|
|
|
else {
|
|
|
|
timeout = (hz * sndbuf_getblksz(bs)) / (sndbuf_getspd(bs) * sndbuf_getbps(bs));
|
|
|
|
if (timeout < 1)
|
|
|
|
timeout = 1;
|
2001-08-29 09:17:43 +00:00
|
|
|
timeout = 1;
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = chn_sleep(c, "pcmwr", timeout);
|
|
|
|
if (ret == EWOULDBLOCK) {
|
|
|
|
count -= timeout;
|
|
|
|
ret = 0;
|
|
|
|
} else if (ret == 0)
|
2001-03-25 21:43:24 +00:00
|
|
|
count = hz;
|
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
} else {
|
|
|
|
sz = MIN(sz, buf->uio_resid);
|
|
|
|
KASSERT(sz > 0, ("confusion in chn_write"));
|
|
|
|
/* printf("sz: %d\n", sz); */
|
2003-11-27 19:51:44 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The following assumes that the free space in
|
|
|
|
* the buffer can never be less around the
|
|
|
|
* unlock-uiomove-lock sequence.
|
|
|
|
*/
|
|
|
|
togo = sz;
|
|
|
|
while (ret == 0 && togo> 0) {
|
|
|
|
p = sndbuf_getfreeptr(bs);
|
|
|
|
t = MIN(togo, sndbuf_getsize(bs) - p);
|
|
|
|
off = sndbuf_getbufofs(bs, p);
|
|
|
|
CHN_UNLOCK(c);
|
|
|
|
ret = uiomove(off, t, buf);
|
|
|
|
CHN_LOCK(c);
|
|
|
|
togo -= t;
|
|
|
|
x = sndbuf_acquire(bs, NULL, t);
|
|
|
|
}
|
|
|
|
ret = 0;
|
2001-03-24 23:10:29 +00:00
|
|
|
if (ret == 0 && !(c->flags & CHN_F_TRIGGERED))
|
|
|
|
chn_start(c, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* printf("ret: %d left: %d\n", ret, buf->uio_resid); */
|
|
|
|
|
|
|
|
if (count <= 0) {
|
2001-03-25 21:43:24 +00:00
|
|
|
c->flags |= CHN_F_DEAD;
|
2001-09-05 16:28:41 +00:00
|
|
|
printf("%s: play interrupt timeout, channel dead\n", c->name);
|
2001-03-25 21:43:24 +00:00
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
|
1999-12-29 03:46:54 +00:00
|
|
|
return ret;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
2006-01-01 18:16:13 +00:00
|
|
|
#if 0
|
2000-05-26 21:55:13 +00:00
|
|
|
static int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_rddump(struct pcm_channel *c, unsigned int cnt)
|
2000-05-26 21:55:13 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
|
|
|
|
CHN_LOCKASSERT(c);
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
#if 0
|
|
|
|
static uint32_t kk = 0;
|
|
|
|
printf("%u: dumping %d bytes\n", ++kk, cnt);
|
|
|
|
#endif
|
|
|
|
c->xruns++;
|
2001-03-24 23:10:29 +00:00
|
|
|
sndbuf_setxrun(b, sndbuf_getxrun(b) + cnt);
|
|
|
|
return sndbuf_dispose(b, NULL, cnt);
|
2000-05-26 21:55:13 +00:00
|
|
|
}
|
2006-01-01 18:16:13 +00:00
|
|
|
#endif
|
2000-05-26 21:55:13 +00:00
|
|
|
|
1999-12-13 03:29:09 +00:00
|
|
|
/*
|
2001-08-29 02:49:54 +00:00
|
|
|
* Feed new data from the read buffer. Can be called in the bottom half.
|
1999-12-13 03:29:09 +00:00
|
|
|
*/
|
1999-12-29 03:46:54 +00:00
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_rdfeed(struct pcm_channel *c)
|
1999-12-13 03:29:09 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
2001-08-29 02:49:54 +00:00
|
|
|
unsigned int ret, amt;
|
2001-02-07 06:48:28 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
|
|
|
DEB(
|
|
|
|
if (c->flags & CHN_F_CLOSING) {
|
|
|
|
sndbuf_dump(b, "b", 0x02);
|
|
|
|
sndbuf_dump(bs, "bs", 0x02);
|
|
|
|
})
|
1999-12-13 03:29:09 +00:00
|
|
|
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
#if 0
|
2001-08-29 02:49:54 +00:00
|
|
|
amt = sndbuf_getready(b);
|
2001-10-24 12:33:21 +00:00
|
|
|
if (sndbuf_getfree(bs) < amt) {
|
2001-08-29 02:49:54 +00:00
|
|
|
c->xruns++;
|
2001-10-24 12:33:21 +00:00
|
|
|
amt = sndbuf_getfree(bs);
|
|
|
|
}
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
#endif
|
|
|
|
amt = sndbuf_getfree(bs);
|
2001-08-29 02:49:54 +00:00
|
|
|
ret = (amt > 0)? sndbuf_feed(b, bs, c, c->feeder, amt) : 0;
|
1999-12-13 03:29:09 +00:00
|
|
|
|
2001-09-05 14:49:44 +00:00
|
|
|
amt = sndbuf_getready(b);
|
2006-01-01 18:16:13 +00:00
|
|
|
if (amt > 0) {
|
|
|
|
c->xruns++;
|
|
|
|
sndbuf_dispose(b, NULL, amt);
|
|
|
|
}
|
2001-08-29 02:49:54 +00:00
|
|
|
|
|
|
|
chn_wakeup(c);
|
1999-12-13 03:29:09 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
return ret;
|
1999-12-13 03:29:09 +00:00
|
|
|
}
|
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
void
|
|
|
|
chn_rdupdate(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
int ret;
|
2001-02-07 20:45:40 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
|
|
|
KASSERT(c->direction == PCMDIR_REC, ("chn_rdupdate on bad channel"));
|
2001-02-07 20:45:40 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
if ((c->flags & CHN_F_MAPPED) || !(c->flags & CHN_F_TRIGGERED))
|
|
|
|
return;
|
|
|
|
chn_trigger(c, PCMTRIG_EMLDMARD);
|
1999-12-29 03:46:54 +00:00
|
|
|
chn_dmaupdate(c);
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = chn_rdfeed(c);
|
2006-01-01 18:16:13 +00:00
|
|
|
DEB(if (ret)
|
|
|
|
printf("chn_rdfeed: %d\n", ret);)
|
2001-02-07 20:45:40 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
}
|
2001-02-07 20:45:40 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
/* read interrupt routine. Must be called with interrupts blocked. */
|
|
|
|
static void
|
|
|
|
chn_rdintr(struct pcm_channel *c)
|
|
|
|
{
|
|
|
|
int ret;
|
2001-02-07 20:45:40 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
2001-08-29 02:49:54 +00:00
|
|
|
/* tell the driver to update the primary buffer if non-dma */
|
2001-03-25 21:43:24 +00:00
|
|
|
chn_trigger(c, PCMTRIG_EMLDMARD);
|
2001-08-29 09:17:43 +00:00
|
|
|
/* update pointers in primary buffer */
|
2001-03-25 21:43:24 +00:00
|
|
|
chn_dmaupdate(c);
|
2001-03-24 23:10:29 +00:00
|
|
|
/* ...and feed from primary to secondary */
|
|
|
|
ret = chn_rdfeed(c);
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2002-01-23 05:41:35 +00:00
|
|
|
* user read routine - trigger if necessary, uiomove data from secondary buffer
|
2001-03-24 23:10:29 +00:00
|
|
|
* if blocking, sleep, rinse and repeat.
|
2001-02-07 20:45:40 +00:00
|
|
|
*
|
2001-03-24 23:10:29 +00:00
|
|
|
* called externally, so must handle locking
|
1999-09-01 04:08:39 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_read(struct pcm_channel *c, struct uio *buf)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
int ret, timeout, sz, count;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
2003-11-27 19:51:44 +00:00
|
|
|
void *off;
|
|
|
|
int t, x,togo,p;
|
2001-02-07 20:45:40 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
|
|
|
if (!(c->flags & CHN_F_TRIGGERED))
|
2000-10-26 20:46:58 +00:00
|
|
|
chn_start(c, 0);
|
1999-12-29 03:46:54 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = 0;
|
2001-03-25 21:43:24 +00:00
|
|
|
count = hz;
|
2001-03-24 23:10:29 +00:00
|
|
|
while (!ret && (buf->uio_resid > 0) && (count > 0)) {
|
2001-10-24 12:33:21 +00:00
|
|
|
sz = MIN(buf->uio_resid, sndbuf_getready(bs));
|
1999-12-29 03:46:54 +00:00
|
|
|
|
2001-10-24 12:33:21 +00:00
|
|
|
if (sz > 0) {
|
2003-11-27 19:51:44 +00:00
|
|
|
/*
|
|
|
|
* The following assumes that the free space in
|
|
|
|
* the buffer can never be less around the
|
|
|
|
* unlock-uiomove-lock sequence.
|
|
|
|
*/
|
|
|
|
togo = sz;
|
|
|
|
while (ret == 0 && togo> 0) {
|
|
|
|
p = sndbuf_getreadyptr(bs);
|
|
|
|
t = MIN(togo, sndbuf_getsize(bs) - p);
|
|
|
|
off = sndbuf_getbufofs(bs, p);
|
|
|
|
CHN_UNLOCK(c);
|
|
|
|
ret = uiomove(off, t, buf);
|
|
|
|
CHN_LOCK(c);
|
|
|
|
togo -= t;
|
|
|
|
x = sndbuf_dispose(bs, NULL, t);
|
|
|
|
}
|
|
|
|
ret = 0;
|
2001-03-24 23:10:29 +00:00
|
|
|
} else {
|
2001-10-24 12:33:21 +00:00
|
|
|
if (c->flags & CHN_F_NBIO) {
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = EWOULDBLOCK;
|
2001-10-24 12:33:21 +00:00
|
|
|
} else {
|
2001-03-24 23:10:29 +00:00
|
|
|
timeout = (hz * sndbuf_getblksz(bs)) / (sndbuf_getspd(bs) * sndbuf_getbps(bs));
|
|
|
|
if (timeout < 1)
|
|
|
|
timeout = 1;
|
|
|
|
ret = chn_sleep(c, "pcmrd", timeout);
|
|
|
|
if (ret == EWOULDBLOCK) {
|
|
|
|
count -= timeout;
|
|
|
|
ret = 0;
|
2001-10-24 12:33:21 +00:00
|
|
|
} else {
|
|
|
|
count = hz;
|
2001-03-24 23:10:29 +00:00
|
|
|
}
|
2001-10-24 12:33:21 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
}
|
2000-06-20 23:42:08 +00:00
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (count <= 0) {
|
2001-03-25 21:43:24 +00:00
|
|
|
c->flags |= CHN_F_DEAD;
|
2001-09-05 16:28:41 +00:00
|
|
|
printf("%s: record interrupt timeout, channel dead\n", c->name);
|
2001-03-25 21:43:24 +00:00
|
|
|
}
|
2000-06-06 22:30:22 +00:00
|
|
|
|
1999-09-01 04:08:39 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_intr(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCK(c);
|
2001-08-29 02:49:54 +00:00
|
|
|
c->interrupts++;
|
2000-04-17 17:06:47 +00:00
|
|
|
if (c->direction == PCMDIR_PLAY)
|
|
|
|
chn_wrintr(c);
|
|
|
|
else
|
|
|
|
chn_rdintr(c);
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_UNLOCK(c);
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
2000-05-26 21:55:13 +00:00
|
|
|
u_int32_t
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_start(struct pcm_channel *c, int force)
|
2000-05-26 21:55:13 +00:00
|
|
|
{
|
2001-08-29 09:17:43 +00:00
|
|
|
u_int32_t i, j;
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
|
|
|
|
|
|
|
CHN_LOCKASSERT(c);
|
|
|
|
/* if we're running, or if we're prevented from triggering, bail */
|
2001-08-23 11:58:38 +00:00
|
|
|
if ((c->flags & CHN_F_TRIGGERED) || ((c->flags & CHN_F_NOTRIGGER) && !force))
|
2001-03-24 23:10:29 +00:00
|
|
|
return EINVAL;
|
|
|
|
|
|
|
|
i = (c->direction == PCMDIR_PLAY)? sndbuf_getready(bs) : sndbuf_getfree(bs);
|
2001-08-29 09:17:43 +00:00
|
|
|
j = (c->direction == PCMDIR_PLAY)? sndbuf_getfree(b) : sndbuf_getready(b);
|
|
|
|
if (force || (i >= j)) {
|
2001-03-24 23:10:29 +00:00
|
|
|
c->flags |= CHN_F_TRIGGERED;
|
2001-05-27 17:22:00 +00:00
|
|
|
/*
|
|
|
|
* if we're starting because a vchan started, don't feed any data
|
|
|
|
* or it becomes impossible to start vchans synchronised with the
|
|
|
|
* first one. the hardbuf should be empty so we top it up with
|
|
|
|
* silence to give it something to chew. the real data will be
|
|
|
|
* fed at the first irq.
|
|
|
|
*/
|
|
|
|
if (c->direction == PCMDIR_PLAY) {
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
/*
|
|
|
|
* Reduce pops during playback startup.
|
|
|
|
*/
|
|
|
|
sndbuf_fillsilence(b);
|
2001-05-27 17:22:00 +00:00
|
|
|
if (SLIST_EMPTY(&c->children))
|
|
|
|
chn_wrfeed(c);
|
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
sndbuf_setrun(b, 1);
|
2001-08-29 09:17:43 +00:00
|
|
|
c->xruns = 0;
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_trigger(c, PCMTRIG_START);
|
|
|
|
return 0;
|
2000-05-26 21:55:13 +00:00
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
|
|
|
|
return 0;
|
2000-05-26 21:55:13 +00:00
|
|
|
}
|
|
|
|
|
1999-09-01 04:08:39 +00:00
|
|
|
void
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_resetbuf(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
1999-09-01 04:08:39 +00:00
|
|
|
|
2000-04-15 05:04:12 +00:00
|
|
|
c->blocks = 0;
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
sndbuf_reset(b);
|
|
|
|
sndbuf_reset(bs);
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1999-12-29 03:46:54 +00:00
|
|
|
* chn_sync waits until the space in the given channel goes above
|
1999-09-01 04:08:39 +00:00
|
|
|
* a threshold. The threshold is checked against fl or rl respectively.
|
|
|
|
* Assume that the condition can become true, do not check here...
|
|
|
|
*/
|
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_sync(struct pcm_channel *c, int threshold)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
u_long rdy;
|
1999-09-01 04:08:39 +00:00
|
|
|
int ret;
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
1999-09-01 04:08:39 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
2003-08-18 23:18:47 +00:00
|
|
|
|
|
|
|
/* if we haven't yet started and nothing is buffered, else start*/
|
|
|
|
if (!(c->flags & CHN_F_TRIGGERED)) {
|
|
|
|
if (sndbuf_getready(bs) > 0) {
|
|
|
|
ret = chn_start(c, 1);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
} else {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (;;) {
|
2001-03-24 23:10:29 +00:00
|
|
|
rdy = (c->direction == PCMDIR_PLAY)? sndbuf_getfree(bs) : sndbuf_getready(bs);
|
1999-09-01 04:08:39 +00:00
|
|
|
if (rdy <= threshold) {
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = chn_sleep(c, "pcmsyn", 1);
|
1999-09-01 04:08:39 +00:00
|
|
|
if (ret == ERESTART || ret == EINTR) {
|
1999-12-05 19:09:13 +00:00
|
|
|
DEB(printf("chn_sync: tsleep returns %d\n", ret));
|
1999-09-01 04:08:39 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
} else
|
|
|
|
break;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
/* called externally, handle locking */
|
1999-09-01 04:08:39 +00:00
|
|
|
int
|
2001-09-12 08:38:13 +00:00
|
|
|
chn_poll(struct pcm_channel *c, int ev, struct thread *td)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
1999-12-29 03:46:54 +00:00
|
|
|
int ret;
|
|
|
|
|
2001-06-14 13:31:30 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
2001-03-24 23:10:29 +00:00
|
|
|
if (!(c->flags & CHN_F_MAPPED) && !(c->flags & CHN_F_TRIGGERED))
|
2001-03-25 21:43:24 +00:00
|
|
|
chn_start(c, 1);
|
1999-12-29 03:46:54 +00:00
|
|
|
ret = 0;
|
|
|
|
if (chn_polltrigger(c) && chn_pollreset(c))
|
|
|
|
ret = ev;
|
2000-04-15 05:04:12 +00:00
|
|
|
else
|
2001-09-21 22:46:54 +00:00
|
|
|
selrecord(td, sndbuf_getsel(bs));
|
1999-12-29 03:46:54 +00:00
|
|
|
return ret;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2001-03-24 23:10:29 +00:00
|
|
|
* chn_abort terminates a running dma transfer. it may sleep up to 200ms.
|
|
|
|
* it returns the number of bytes that have not been transferred.
|
|
|
|
*
|
2001-05-27 17:22:00 +00:00
|
|
|
* called from: dsp_close, dsp_ioctl, with channel locked
|
1999-09-01 04:08:39 +00:00
|
|
|
*/
|
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_abort(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-06-16 21:25:10 +00:00
|
|
|
int missing = 0;
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
1999-09-01 04:08:39 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
|
|
|
if (!(c->flags & CHN_F_TRIGGERED))
|
2000-06-13 23:18:43 +00:00
|
|
|
return 0;
|
1999-12-18 22:24:50 +00:00
|
|
|
c->flags |= CHN_F_ABORTING;
|
2001-03-24 23:10:29 +00:00
|
|
|
|
|
|
|
c->flags &= ~CHN_F_TRIGGERED;
|
|
|
|
/* kill the channel */
|
1999-12-18 22:24:50 +00:00
|
|
|
chn_trigger(c, PCMTRIG_ABORT);
|
2001-03-24 23:10:29 +00:00
|
|
|
sndbuf_setrun(b, 0);
|
2001-06-07 20:06:22 +00:00
|
|
|
if (!(c->flags & CHN_F_VIRTUAL))
|
|
|
|
chn_dmaupdate(c);
|
2001-03-24 23:10:29 +00:00
|
|
|
missing = sndbuf_getready(bs) + sndbuf_getready(b);
|
|
|
|
|
|
|
|
c->flags &= ~CHN_F_ABORTING;
|
2001-03-25 21:43:24 +00:00
|
|
|
return missing;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* this routine tries to flush the dma transfer. It is called
|
2003-08-18 23:18:47 +00:00
|
|
|
* on a close of a playback channel.
|
|
|
|
* first, if there is data in the buffer, but the dma has not yet
|
|
|
|
* begun, we need to start it.
|
|
|
|
* next, we wait for the play buffer to drain
|
|
|
|
* finally, we stop the dma.
|
2001-03-24 23:10:29 +00:00
|
|
|
*
|
2003-08-18 23:18:47 +00:00
|
|
|
* called from: dsp_close, not valid for record channels.
|
1999-09-01 04:08:39 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_flush(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
int ret, count, resid, resid_p;
|
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
1999-09-01 04:08:39 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
2003-08-18 23:18:47 +00:00
|
|
|
KASSERT(c->direction == PCMDIR_PLAY, ("chn_flush on bad channel"));
|
|
|
|
DEB(printf("chn_flush: c->flags 0x%08x\n", c->flags));
|
|
|
|
|
|
|
|
/* if we haven't yet started and nothing is buffered, else start*/
|
|
|
|
if (!(c->flags & CHN_F_TRIGGERED)) {
|
|
|
|
if (sndbuf_getready(bs) > 0) {
|
|
|
|
ret = chn_start(c, 1);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
} else {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2000-11-07 00:32:35 +00:00
|
|
|
|
2001-03-25 21:43:24 +00:00
|
|
|
c->flags |= CHN_F_CLOSING;
|
2001-03-24 23:10:29 +00:00
|
|
|
resid = sndbuf_getready(bs) + sndbuf_getready(b);
|
2001-03-25 21:43:24 +00:00
|
|
|
resid_p = resid;
|
|
|
|
count = 10;
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = 0;
|
|
|
|
while ((count > 0) && (resid > sndbuf_getsize(b)) && (ret == 0)) {
|
2001-03-25 21:43:24 +00:00
|
|
|
/* still pending output data. */
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = chn_sleep(c, "pcmflu", hz / 10);
|
|
|
|
if (ret == EWOULDBLOCK)
|
|
|
|
ret = 0;
|
|
|
|
if (ret == 0) {
|
|
|
|
resid = sndbuf_getready(bs) + sndbuf_getready(b);
|
2003-08-18 23:18:47 +00:00
|
|
|
if (resid == resid_p)
|
2000-06-13 23:18:43 +00:00
|
|
|
count--;
|
2003-08-18 23:18:47 +00:00
|
|
|
if (resid > resid_p)
|
|
|
|
DEB(printf("chn_flush: buffer length increasind %d -> %d\n", resid_p, resid));
|
2000-06-13 23:18:43 +00:00
|
|
|
resid_p = resid;
|
2001-03-25 21:43:24 +00:00
|
|
|
}
|
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
if (count == 0)
|
2003-08-18 23:18:47 +00:00
|
|
|
DEB(printf("chn_flush: timeout, hw %d, sw %d\n",
|
|
|
|
sndbuf_getready(b), sndbuf_getready(bs)));
|
2001-03-24 23:10:29 +00:00
|
|
|
|
|
|
|
c->flags &= ~CHN_F_TRIGGERED;
|
|
|
|
/* kill the channel */
|
|
|
|
chn_trigger(c, PCMTRIG_ABORT);
|
|
|
|
sndbuf_setrun(b, 0);
|
|
|
|
|
1999-09-01 04:08:39 +00:00
|
|
|
c->flags &= ~CHN_F_CLOSING;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-09-23 22:11:32 +00:00
|
|
|
int
|
|
|
|
fmtvalid(u_int32_t fmt, u_int32_t *fmtlist)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; fmtlist[i]; i++)
|
|
|
|
if (fmt == fmtlist[i])
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1999-09-01 04:08:39 +00:00
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_reset(struct pcm_channel *c, u_int32_t fmt)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2002-01-23 05:21:27 +00:00
|
|
|
int hwspd, r;
|
2000-04-15 05:04:12 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
1999-09-01 04:08:39 +00:00
|
|
|
c->flags &= CHN_F_RESET;
|
2001-08-29 02:49:54 +00:00
|
|
|
c->interrupts = 0;
|
|
|
|
c->xruns = 0;
|
2002-01-23 05:21:27 +00:00
|
|
|
|
|
|
|
r = CHANNEL_RESET(c->methods, c->devinfo);
|
|
|
|
if (fmt != 0) {
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
#if 0
|
2000-11-18 03:43:04 +00:00
|
|
|
hwspd = DSP_DEFAULT_SPEED;
|
2001-08-27 01:02:13 +00:00
|
|
|
/* only do this on a record channel until feederbuilder works */
|
|
|
|
if (c->direction == PCMDIR_REC)
|
|
|
|
RANGE(hwspd, chn_getcaps(c)->minspeed, chn_getcaps(c)->maxspeed);
|
2000-11-18 03:43:04 +00:00
|
|
|
c->speed = hwspd;
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
#endif
|
|
|
|
hwspd = chn_getcaps(c)->minspeed;
|
|
|
|
c->speed = hwspd;
|
2000-11-18 03:43:04 +00:00
|
|
|
|
2002-01-23 05:21:27 +00:00
|
|
|
if (r == 0)
|
|
|
|
r = chn_setformat(c, fmt);
|
2000-05-26 21:55:13 +00:00
|
|
|
if (r == 0)
|
2000-11-18 03:43:04 +00:00
|
|
|
r = chn_setspeed(c, hwspd);
|
2005-10-02 15:37:40 +00:00
|
|
|
#if 0
|
2000-05-26 21:55:13 +00:00
|
|
|
if (r == 0)
|
|
|
|
r = chn_setvolume(c, 100, 100);
|
2005-10-02 15:37:40 +00:00
|
|
|
#endif
|
2000-04-17 17:06:47 +00:00
|
|
|
}
|
2002-01-23 05:21:27 +00:00
|
|
|
if (r == 0)
|
|
|
|
r = chn_setblocksize(c, 0, 0);
|
2001-03-24 23:10:29 +00:00
|
|
|
if (r == 0) {
|
2001-03-25 21:43:24 +00:00
|
|
|
chn_resetbuf(c);
|
2002-01-23 05:21:27 +00:00
|
|
|
r = CHANNEL_RESETDONE(c->methods, c->devinfo);
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
return r;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2004-02-28 19:47:02 +00:00
|
|
|
chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2000-12-18 01:36:41 +00:00
|
|
|
struct feeder_class *fc;
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b, *bs;
|
2002-01-23 05:21:27 +00:00
|
|
|
int ret;
|
1999-12-13 03:29:09 +00:00
|
|
|
|
2003-12-05 02:08:13 +00:00
|
|
|
chn_lockinit(c, dir);
|
2001-08-29 02:49:54 +00:00
|
|
|
|
2002-01-23 05:21:27 +00:00
|
|
|
b = NULL;
|
|
|
|
bs = NULL;
|
|
|
|
c->devinfo = NULL;
|
2000-12-18 01:36:41 +00:00
|
|
|
c->feeder = NULL;
|
2002-01-23 05:21:27 +00:00
|
|
|
|
2004-01-28 08:02:15 +00:00
|
|
|
ret = ENOMEM;
|
|
|
|
b = sndbuf_create(c->dev, c->name, "primary", c);
|
|
|
|
if (b == NULL)
|
|
|
|
goto out;
|
|
|
|
bs = sndbuf_create(c->dev, c->name, "secondary", c);
|
|
|
|
if (bs == NULL)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
CHN_LOCK(c);
|
|
|
|
|
2002-01-23 05:21:27 +00:00
|
|
|
ret = EINVAL;
|
2000-12-18 01:36:41 +00:00
|
|
|
fc = feeder_getclass(NULL);
|
|
|
|
if (fc == NULL)
|
2002-01-23 05:21:27 +00:00
|
|
|
goto out;
|
2000-12-18 01:36:41 +00:00
|
|
|
if (chn_addfeeder(c, fc, NULL))
|
2002-01-23 05:21:27 +00:00
|
|
|
goto out;
|
2000-08-20 22:18:56 +00:00
|
|
|
|
2004-01-28 08:02:15 +00:00
|
|
|
/*
|
|
|
|
* XXX - sndbuf_setup() & sndbuf_resize() expect to be called
|
|
|
|
* with the channel unlocked because they are also called
|
|
|
|
* from driver methods that don't know about locking
|
|
|
|
*/
|
|
|
|
CHN_UNLOCK(c);
|
2001-03-24 23:10:29 +00:00
|
|
|
sndbuf_setup(bs, NULL, 0);
|
2004-01-28 08:02:15 +00:00
|
|
|
CHN_LOCK(c);
|
2001-03-24 23:10:29 +00:00
|
|
|
c->bufhard = b;
|
|
|
|
c->bufsoft = bs;
|
1999-09-01 04:08:39 +00:00
|
|
|
c->flags = 0;
|
2000-09-23 22:11:32 +00:00
|
|
|
c->feederflags = 0;
|
2002-01-23 05:21:27 +00:00
|
|
|
|
|
|
|
ret = ENODEV;
|
2004-01-28 08:02:15 +00:00
|
|
|
CHN_UNLOCK(c); /* XXX - Unlock for CHANNEL_INIT() malloc() call */
|
2004-02-28 19:47:02 +00:00
|
|
|
c->devinfo = CHANNEL_INIT(c->methods, devinfo, b, c, direction);
|
2004-01-28 08:02:15 +00:00
|
|
|
CHN_LOCK(c);
|
2002-01-23 05:21:27 +00:00
|
|
|
if (c->devinfo == NULL)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = ENOMEM;
|
|
|
|
if ((sndbuf_getsize(b) == 0) && ((c->flags & CHN_F_VIRTUAL) == 0))
|
|
|
|
goto out;
|
|
|
|
|
2004-02-28 19:47:02 +00:00
|
|
|
ret = chn_setdir(c, direction);
|
2002-01-23 05:21:27 +00:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = sndbuf_setfmt(b, AFMT_U8);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = sndbuf_setfmt(bs, AFMT_U8);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
|
|
out:
|
2004-01-28 08:02:15 +00:00
|
|
|
CHN_UNLOCK(c);
|
2002-01-23 05:21:27 +00:00
|
|
|
if (ret) {
|
|
|
|
if (c->devinfo) {
|
|
|
|
if (CHANNEL_FREE(c->methods, c->devinfo))
|
|
|
|
sndbuf_free(b);
|
|
|
|
}
|
|
|
|
if (bs)
|
|
|
|
sndbuf_destroy(bs);
|
|
|
|
if (b)
|
|
|
|
sndbuf_destroy(b);
|
|
|
|
c->flags |= CHN_F_DEAD;
|
|
|
|
chn_lockdestroy(c);
|
|
|
|
|
|
|
|
return ret;
|
2001-03-24 23:10:29 +00:00
|
|
|
}
|
1999-12-29 03:46:54 +00:00
|
|
|
|
1999-09-01 04:08:39 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-09-01 20:09:24 +00:00
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_kill(struct pcm_channel *c)
|
2000-09-01 20:09:24 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
|
|
|
|
2000-09-09 19:21:04 +00:00
|
|
|
if (c->flags & CHN_F_TRIGGERED)
|
|
|
|
chn_trigger(c, PCMTRIG_ABORT);
|
2000-09-01 20:09:24 +00:00
|
|
|
while (chn_removefeeder(c) == 0);
|
2000-12-18 01:36:41 +00:00
|
|
|
if (CHANNEL_FREE(c->methods, c->devinfo))
|
2002-01-25 02:36:22 +00:00
|
|
|
sndbuf_free(b);
|
2000-09-01 20:09:24 +00:00
|
|
|
c->flags |= CHN_F_DEAD;
|
2001-03-24 23:10:29 +00:00
|
|
|
sndbuf_destroy(bs);
|
|
|
|
sndbuf_destroy(b);
|
|
|
|
chn_lockdestroy(c);
|
2000-09-01 20:09:24 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1999-09-01 04:08:39 +00:00
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_setdir(struct pcm_channel *c, int dir)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2005-06-10 21:33:14 +00:00
|
|
|
#ifdef DEV_ISA
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b = c->bufhard;
|
2005-06-10 21:33:14 +00:00
|
|
|
#endif
|
1999-12-29 03:46:54 +00:00
|
|
|
int r;
|
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
1999-09-01 04:08:39 +00:00
|
|
|
c->direction = dir;
|
2000-12-18 01:36:41 +00:00
|
|
|
r = CHANNEL_SETDIR(c->methods, c->devinfo, c->direction);
|
2005-06-10 21:33:14 +00:00
|
|
|
#ifdef DEV_ISA
|
2003-02-07 14:05:34 +00:00
|
|
|
if (!r && SND_DMA(b))
|
|
|
|
sndbuf_dmasetdir(b, c->direction);
|
2005-06-10 21:33:14 +00:00
|
|
|
#endif
|
1999-12-29 03:46:54 +00:00
|
|
|
return r;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_setvolume(struct pcm_channel *c, int left, int right)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
2003-08-18 23:18:47 +00:00
|
|
|
/* should add a feeder for volume changing if channel returns -1 */
|
2005-10-02 15:37:40 +00:00
|
|
|
if (left > 100)
|
|
|
|
left = 100;
|
|
|
|
if (left < 0)
|
|
|
|
left = 0;
|
|
|
|
if (right > 100)
|
|
|
|
right = 100;
|
|
|
|
if (right < 0)
|
|
|
|
right = 0;
|
|
|
|
c->volume = left | (right << 8);
|
2001-03-25 21:43:24 +00:00
|
|
|
return 0;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
2001-02-13 21:57:34 +00:00
|
|
|
static int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_tryspeed(struct pcm_channel *c, int speed)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct pcm_feeder *f;
|
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
2002-01-23 05:35:12 +00:00
|
|
|
struct snd_dbuf *x;
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
int r, delta;
|
2000-09-23 22:11:32 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
2001-05-27 17:22:00 +00:00
|
|
|
DEB(printf("setspeed, channel %s\n", c->name));
|
2000-09-23 22:11:32 +00:00
|
|
|
DEB(printf("want speed %d, ", speed));
|
2000-05-26 21:55:13 +00:00
|
|
|
if (speed <= 0)
|
|
|
|
return EINVAL;
|
1999-09-01 04:08:39 +00:00
|
|
|
if (CANCHANGE(c)) {
|
2001-03-24 23:10:29 +00:00
|
|
|
r = 0;
|
2000-09-23 22:11:32 +00:00
|
|
|
c->speed = speed;
|
2001-03-24 23:10:29 +00:00
|
|
|
sndbuf_setspd(bs, speed);
|
|
|
|
RANGE(speed, chn_getcaps(c)->minspeed, chn_getcaps(c)->maxspeed);
|
2001-04-08 20:20:52 +00:00
|
|
|
DEB(printf("try speed %d, ", speed));
|
|
|
|
sndbuf_setspd(b, CHANNEL_SETSPEED(c->methods, c->devinfo, speed));
|
2001-05-27 17:22:00 +00:00
|
|
|
DEB(printf("got speed %d\n", sndbuf_getspd(b)));
|
2001-03-24 23:10:29 +00:00
|
|
|
|
|
|
|
delta = sndbuf_getspd(b) - sndbuf_getspd(bs);
|
2000-09-23 22:11:32 +00:00
|
|
|
if (delta < 0)
|
|
|
|
delta = -delta;
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
|
2000-09-23 22:11:32 +00:00
|
|
|
c->feederflags &= ~(1 << FEEDER_RATE);
|
Whats New:
1. Support wide range sampling rate, as low as 1hz up to int32 max
(which is, insane) through new feeder_rate, multiple precisions
choice (32/64 bit converter). This is indeed, quite insane, but it
does give us more room and flexibility. Plenty sysctl options to
adjust resampling characteristics.
2. Support 24/32 bit pcm format conversion through new, much improved,
simplified and optimized feeder_fmt.
Changes:
1. buffer.c / dsp.c / sound.h
* Support for 24/32 AFMT.
2. feeder_rate.c
* New implementation of sampling rate conversion with 32/64 bit
precision, 1 - int32max hz (which is, ridiculous, yet very
addictive). Much improved / smarter buffer management to not
cause any missing samples at the end of conversion process
* Tunable sysctls for various aspect:
hw.snd.feeder_rate_ratemin - minimum allowable sampling rate
(default to 4000)
hw.snd.feeder_rate_ratemax - maximum allowable sampling rate
(default to 1102500)
hw.snd.feeder_rate_buffersize - conversion buffer size
(default to 8192)
hw.snd.feeder_rate_scaling - scaling / conversion method
(please refer to the source for explaination). Default to
previous implementation type.
3. feeder_fmt.c / sound.h
* New implementation, support for 24/32bit conversion, optimized,
and simplified. Few routines has been removed (8 to xlaw, 16 to
8). It just doesn't make sense.
4. channel.c
* Support for 24/32 AFMT
* Fix wrong xruns increment, causing incorrect underruns statistic
while using vchans.
5. vchan.c
* Support for 24/32 AFMT
* Proper speed / rate detection especially for fixed rate ac97.
User can override it using kernel hint:
hint.pcm.<unit>.vchanrate="xxxx".
Notes / Issues:
* Virtual Channels (vchans)
Enabling vchans can really, really help to solve overrun
issues. This is quite understandable, because it operates
entirely within its own buffering system without relying on
hardware interrupt / state. Even if you don't need vchan,
just enable single channel can help much. Few soundcards
(notably via8233x, sblive, possibly others) have their own
hardware multi channel, and this is unfortunately beyond
vchan reachability.
* The arrival of 24/32 also come with a price. Applications
that can do 24/32bit playback need to be recompiled (notably
mplayer). Use (recompiled) mplayer to experiment / test /
debug this various format using -af format=fmt. Note that
24bit seeking in mplayer is a little bit broken, sometimes
can cause silence or loud static noise. Pausing / seeking
few times can solve this problem.
You don't have to rebuild world entirely for this. Simply
copy /usr/src/sys/sys/soundcard.h to
/usr/include/sys/soundcard.h would suffice. Few drivers also
need recompilation, and this can be done via
/usr/src/sys/modules/sound/.
Support for 24bit hardware playback is beyond the scope of
this changes. That would require spessific hardware driver
changes.
* Don't expect playing 9999999999hz is a wise decision. Be
reasonable. The new feeder_rate implemention provide
flexibility, not insanity. You can easily chew up your CPU
with this kind of mind instability. Please use proper
mosquito repellent device for this obvious cracked brain
attempt. As for testing purposes, you can use (again)
mplayer to generate / play with different sampling rate. Use
something like "mplayer -af resample=192000:0:0 <files>".
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
Tested by: multimedia@
2005-07-31 16:16:22 +00:00
|
|
|
/*
|
|
|
|
* Used to be 500. It was too big!
|
|
|
|
*/
|
|
|
|
if (delta > 25)
|
2000-09-23 22:11:32 +00:00
|
|
|
c->feederflags |= 1 << FEEDER_RATE;
|
|
|
|
else
|
2001-03-24 23:10:29 +00:00
|
|
|
sndbuf_setspd(bs, sndbuf_getspd(b));
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
|
2000-09-23 22:11:32 +00:00
|
|
|
r = chn_buildfeeder(c);
|
|
|
|
DEB(printf("r = %d\n", r));
|
|
|
|
if (r)
|
2001-03-24 23:10:29 +00:00
|
|
|
goto out;
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
|
|
|
|
r = chn_setblocksize(c, 0, 0);
|
|
|
|
if (r)
|
2001-03-24 23:10:29 +00:00
|
|
|
goto out;
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
if (!(c->feederflags & (1 << FEEDER_RATE)))
|
2001-03-24 23:10:29 +00:00
|
|
|
goto out;
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
r = EINVAL;
|
2000-09-23 22:11:32 +00:00
|
|
|
f = chn_findfeeder(c, FEEDER_RATE);
|
|
|
|
DEB(printf("feedrate = %p\n", f));
|
|
|
|
if (f == NULL)
|
2001-03-24 23:10:29 +00:00
|
|
|
goto out;
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
|
2002-01-23 05:35:12 +00:00
|
|
|
x = (c->direction == PCMDIR_REC)? b : bs;
|
|
|
|
r = FEEDER_SET(f, FEEDRATE_SRC, sndbuf_getspd(x));
|
|
|
|
DEB(printf("feeder_set(FEEDRATE_SRC, %d) = %d\n", sndbuf_getspd(x), r));
|
2000-09-23 22:11:32 +00:00
|
|
|
if (r)
|
2001-03-24 23:10:29 +00:00
|
|
|
goto out;
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
|
2002-01-23 05:35:12 +00:00
|
|
|
x = (c->direction == PCMDIR_REC)? bs : b;
|
|
|
|
r = FEEDER_SET(f, FEEDRATE_DST, sndbuf_getspd(x));
|
|
|
|
DEB(printf("feeder_set(FEEDRATE_DST, %d) = %d\n", sndbuf_getspd(x), r));
|
2001-03-24 23:10:29 +00:00
|
|
|
out:
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
if (!r)
|
|
|
|
r = CHANNEL_SETFORMAT(c->methods, c->devinfo,
|
|
|
|
sndbuf_getfmt(b));
|
|
|
|
if (!r)
|
|
|
|
sndbuf_setfmt(bs, c->format);
|
2001-05-27 17:22:00 +00:00
|
|
|
DEB(printf("setspeed done, r = %d\n", r));
|
2001-03-25 21:43:24 +00:00
|
|
|
return r;
|
2001-03-24 23:10:29 +00:00
|
|
|
} else
|
|
|
|
return EINVAL;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_setspeed(struct pcm_channel *c, int speed)
|
2001-02-13 21:57:34 +00:00
|
|
|
{
|
|
|
|
int r, oldspeed = c->speed;
|
|
|
|
|
|
|
|
r = chn_tryspeed(c, speed);
|
|
|
|
if (r) {
|
|
|
|
DEB(printf("Failed to set speed %d falling back to %d\n", speed, oldspeed));
|
2003-02-26 14:38:19 +00:00
|
|
|
r = chn_tryspeed(c, oldspeed);
|
2001-02-13 21:57:34 +00:00
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_tryformat(struct pcm_channel *c, u_int32_t fmt)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
2000-09-23 22:11:32 +00:00
|
|
|
int r;
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
1999-09-01 04:08:39 +00:00
|
|
|
if (CANCHANGE(c)) {
|
2000-09-23 22:11:32 +00:00
|
|
|
DEB(printf("want format %d\n", fmt));
|
2000-05-26 21:55:13 +00:00
|
|
|
c->format = fmt;
|
2000-09-23 22:11:32 +00:00
|
|
|
r = chn_buildfeeder(c);
|
2001-03-24 23:10:29 +00:00
|
|
|
if (r == 0) {
|
2002-01-23 05:21:27 +00:00
|
|
|
sndbuf_setfmt(bs, c->format);
|
2001-03-25 21:43:24 +00:00
|
|
|
chn_resetbuf(c);
|
2002-01-23 05:21:27 +00:00
|
|
|
r = CHANNEL_SETFORMAT(c->methods, c->devinfo, sndbuf_getfmt(b));
|
|
|
|
if (r == 0)
|
|
|
|
r = chn_tryspeed(c, c->speed);
|
2001-03-25 21:43:24 +00:00
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
return r;
|
|
|
|
} else
|
|
|
|
return EINVAL;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
2001-02-13 21:57:34 +00:00
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_setformat(struct pcm_channel *c, u_int32_t fmt)
|
2001-02-13 21:57:34 +00:00
|
|
|
{
|
|
|
|
u_int32_t oldfmt = c->format;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
r = chn_tryformat(c, fmt);
|
|
|
|
if (r) {
|
|
|
|
DEB(printf("Format change %d failed, reverting to %d\n", fmt, oldfmt));
|
|
|
|
chn_tryformat(c, oldfmt);
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2005-11-14 18:21:23 +00:00
|
|
|
/*
|
|
|
|
* given a bufsz value, round it to a power of 2 in the min-max range
|
|
|
|
* XXX only works if min and max are powers of 2
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
round_bufsz(int bufsz, int min, int max)
|
|
|
|
{
|
|
|
|
int tmp = min * 2;
|
|
|
|
|
2005-11-15 04:19:27 +00:00
|
|
|
KASSERT((min & (min-1)) == 0, ("min %d must be power of 2\n", min));
|
|
|
|
KASSERT((max & (max-1)) == 0, ("max %d must be power of 2\n", max));
|
2005-11-14 18:21:23 +00:00
|
|
|
while (tmp <= bufsz)
|
|
|
|
tmp <<= 1;
|
|
|
|
tmp >>= 1;
|
|
|
|
if (tmp > max)
|
|
|
|
tmp = max;
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* set the channel's blocksize both for soft and hard buffers.
|
|
|
|
*
|
|
|
|
* blksz should be a power of 2 between 2**4 and 2**16 -- it is useful
|
|
|
|
* that it has the same value for both bufsoft and bufhard.
|
|
|
|
* blksz == -1 computes values according to a target irq rate.
|
|
|
|
* blksz == 0 reuses previous values if available, otherwise
|
|
|
|
* behaves as for -1
|
|
|
|
*
|
|
|
|
* blkcnt is set by the user, between 2 and (2**17)/blksz for bufsoft,
|
|
|
|
* but should be a power of 2 for bufhard to simplify life to low
|
|
|
|
* level drivers.
|
|
|
|
* Note, for the rec channel a large blkcnt is ok,
|
|
|
|
* but for the play channel we want blksz as small as possible to keep
|
|
|
|
* the delay small, because routines in the write path always try to
|
|
|
|
* keep bufhard full.
|
|
|
|
*
|
|
|
|
* Unless we have good reason to, use the values suggested by the caller.
|
|
|
|
*/
|
1999-09-01 04:08:39 +00:00
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_setblocksize(struct pcm_channel *c, int blkcnt, int blksz)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b = c->bufhard;
|
|
|
|
struct snd_dbuf *bs = c->bufsoft;
|
2005-11-14 18:21:23 +00:00
|
|
|
int irqhz, ret, maxsz, maxsize, reqblksz;
|
1999-12-29 03:46:54 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
2004-01-28 08:02:15 +00:00
|
|
|
if (!CANCHANGE(c) || (c->flags & CHN_F_MAPPED)) {
|
|
|
|
KASSERT(sndbuf_getsize(bs) == 0 ||
|
|
|
|
sndbuf_getsize(bs) >= sndbuf_getsize(b),
|
|
|
|
("%s(%s): bufsoft size %d < bufhard size %d", __func__,
|
|
|
|
c->name, sndbuf_getsize(bs), sndbuf_getsize(b)));
|
2000-04-15 05:04:12 +00:00
|
|
|
return EINVAL;
|
2004-01-28 08:02:15 +00:00
|
|
|
}
|
|
|
|
c->flags |= CHN_F_SETBLOCKSIZE;
|
2000-05-26 21:55:13 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = 0;
|
2001-12-10 08:09:49 +00:00
|
|
|
DEB(printf("%s(%d, %d)\n", __func__, blkcnt, blksz));
|
2005-11-14 18:21:23 +00:00
|
|
|
if (blksz == 0 || blksz == -1) { /* let the driver choose values */
|
|
|
|
if (blksz == -1) /* delete previous values */
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
c->flags &= ~CHN_F_HAS_SIZE;
|
2005-11-14 18:21:23 +00:00
|
|
|
if (!(c->flags & CHN_F_HAS_SIZE)) { /* no previous value */
|
|
|
|
/*
|
|
|
|
* compute a base blksz according to the target irq
|
|
|
|
* rate, then round to a suitable power of 2
|
|
|
|
* in the range 16.. 2^17/2.
|
|
|
|
* Finally compute a suitable blkcnt.
|
|
|
|
*/
|
|
|
|
blksz = round_bufsz( (sndbuf_getbps(bs) *
|
|
|
|
sndbuf_getspd(bs)) / chn_targetirqrate,
|
|
|
|
16, CHN_2NDBUFMAXSIZE / 2);
|
2001-02-07 20:45:40 +00:00
|
|
|
blkcnt = CHN_2NDBUFMAXSIZE / blksz;
|
2005-11-14 18:21:23 +00:00
|
|
|
} else { /* use previously defined value */
|
2001-03-24 23:10:29 +00:00
|
|
|
blkcnt = sndbuf_getblkcnt(bs);
|
|
|
|
blksz = sndbuf_getblksz(bs);
|
2001-01-24 01:15:50 +00:00
|
|
|
}
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
} else {
|
2005-11-14 18:21:23 +00:00
|
|
|
/*
|
|
|
|
* use supplied values if reasonable. Note that here we
|
|
|
|
* might have blksz which is not a power of 2 if the
|
|
|
|
* ioctl() to compute it allows such values.
|
|
|
|
*/
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = EINVAL;
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
if ((blksz < 16) || (blkcnt < 2) || (blkcnt * blksz > CHN_2NDBUFMAXSIZE))
|
2001-03-24 23:10:29 +00:00
|
|
|
goto out;
|
|
|
|
ret = 0;
|
2000-04-23 18:09:18 +00:00
|
|
|
c->flags |= CHN_F_HAS_SIZE;
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
}
|
|
|
|
|
2004-01-28 08:02:15 +00:00
|
|
|
reqblksz = blksz;
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
if (reqblksz < sndbuf_getbps(bs))
|
|
|
|
reqblksz = sndbuf_getbps(bs);
|
|
|
|
if (reqblksz % sndbuf_getbps(bs))
|
|
|
|
reqblksz -= reqblksz % sndbuf_getbps(bs);
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
|
|
|
|
/* adjust for different hw format/speed */
|
2005-11-14 18:21:23 +00:00
|
|
|
/*
|
|
|
|
* Now compute the approx irq rate for the given (soft) blksz,
|
|
|
|
* reduce to the acceptable range and compute a corresponding blksz
|
|
|
|
* for the hard buffer. Then set the channel's blocksize and
|
|
|
|
* corresponding hardbuf value. The number of blocks used should
|
|
|
|
* be set by the device-specific routine. In fact, even the
|
|
|
|
* call to sndbuf_setblksz() should not be here! XXX
|
|
|
|
*/
|
|
|
|
|
2004-01-28 08:02:15 +00:00
|
|
|
irqhz = (sndbuf_getbps(bs) * sndbuf_getspd(bs)) / blksz;
|
2001-01-24 01:15:50 +00:00
|
|
|
RANGE(irqhz, 16, 512);
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
|
2005-11-14 18:21:23 +00:00
|
|
|
maxsz = sndbuf_getmaxsize(b);
|
|
|
|
if (maxsz == 0) /* virtual channels don't appear to allocate bufhard */
|
|
|
|
maxsz = CHN_2NDBUFMAXSIZE;
|
|
|
|
blksz = round_bufsz( (sndbuf_getbps(b) * sndbuf_getspd(b)) / irqhz,
|
|
|
|
16, maxsz / 2);
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
|
2004-01-28 08:02:15 +00:00
|
|
|
/* Increase the size of bufsoft if before increasing bufhard. */
|
|
|
|
maxsize = sndbuf_getsize(b);
|
|
|
|
if (sndbuf_getsize(bs) > maxsize)
|
|
|
|
maxsize = sndbuf_getsize(bs);
|
|
|
|
if (reqblksz * blkcnt > maxsize)
|
|
|
|
maxsize = reqblksz * blkcnt;
|
|
|
|
if (sndbuf_getsize(bs) != maxsize || sndbuf_getblksz(bs) != reqblksz) {
|
|
|
|
ret = sndbuf_remalloc(bs, maxsize/reqblksz, reqblksz);
|
|
|
|
if (ret)
|
|
|
|
goto out1;
|
|
|
|
}
|
|
|
|
|
|
|
|
CHN_UNLOCK(c);
|
2001-03-24 23:10:29 +00:00
|
|
|
sndbuf_setblksz(b, CHANNEL_SETBLOCKSIZE(c->methods, c->devinfo, blksz));
|
2004-01-28 08:02:15 +00:00
|
|
|
CHN_LOCK(c);
|
|
|
|
|
|
|
|
/* Decrease the size of bufsoft after decreasing bufhard. */
|
|
|
|
maxsize = sndbuf_getsize(b);
|
|
|
|
if (reqblksz * blkcnt > maxsize)
|
|
|
|
maxsize = reqblksz * blkcnt;
|
|
|
|
if (maxsize > sndbuf_getsize(bs))
|
|
|
|
printf("Danger! %s bufsoft size increasing from %d to %d after CHANNEL_SETBLOCKSIZE()\n",
|
|
|
|
c->name, sndbuf_getsize(bs), maxsize);
|
|
|
|
if (sndbuf_getsize(bs) != maxsize || sndbuf_getblksz(bs) != reqblksz) {
|
|
|
|
ret = sndbuf_remalloc(bs, maxsize/reqblksz, reqblksz);
|
|
|
|
if (ret)
|
|
|
|
goto out1;
|
|
|
|
}
|
2000-04-15 05:04:12 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_resetbuf(c);
|
2004-01-28 08:02:15 +00:00
|
|
|
out1:
|
|
|
|
KASSERT(sndbuf_getsize(bs) == 0 ||
|
|
|
|
sndbuf_getsize(bs) >= sndbuf_getsize(b),
|
|
|
|
("%s(%s): bufsoft size %d < bufhard size %d, reqblksz=%d blksz=%d maxsize=%d blkcnt=%d",
|
|
|
|
__func__, c->name, sndbuf_getsize(bs), sndbuf_getsize(b), reqblksz,
|
|
|
|
blksz, maxsize, blkcnt));
|
2001-03-24 23:10:29 +00:00
|
|
|
out:
|
2004-01-28 08:02:15 +00:00
|
|
|
c->flags &= ~CHN_F_SETBLOCKSIZE;
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
#if 0
|
|
|
|
if (1) {
|
|
|
|
static uint32_t kk = 0;
|
|
|
|
printf("%u: b %d/%d/%d : (%d)%d/0x%0x | bs %d/%d/%d : (%d)%d/0x%0x\n", ++kk,
|
|
|
|
sndbuf_getsize(b), sndbuf_getblksz(b), sndbuf_getblkcnt(b),
|
|
|
|
sndbuf_getbps(b),
|
|
|
|
sndbuf_getspd(b), sndbuf_getfmt(b),
|
|
|
|
sndbuf_getsize(bs), sndbuf_getblksz(bs), sndbuf_getblkcnt(bs),
|
|
|
|
sndbuf_getbps(bs),
|
|
|
|
sndbuf_getspd(bs), sndbuf_getfmt(bs));
|
|
|
|
if (sndbuf_getsize(b) % sndbuf_getbps(b) ||
|
|
|
|
sndbuf_getblksz(b) % sndbuf_getbps(b) ||
|
|
|
|
sndbuf_getsize(bs) % sndbuf_getbps(bs) ||
|
|
|
|
sndbuf_getblksz(b) % sndbuf_getbps(b)) {
|
|
|
|
printf("%u: bps/blksz alignment screwed!\n", kk);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2001-03-24 23:10:29 +00:00
|
|
|
return ret;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_trigger(struct pcm_channel *c, int go)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2005-06-10 21:33:14 +00:00
|
|
|
#ifdef DEV_ISA
|
2001-03-24 23:10:29 +00:00
|
|
|
struct snd_dbuf *b = c->bufhard;
|
2005-06-10 21:33:14 +00:00
|
|
|
#endif
|
2001-03-24 23:10:29 +00:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
CHN_LOCKASSERT(c);
|
2005-06-10 21:33:14 +00:00
|
|
|
#ifdef DEV_ISA
|
2003-02-07 14:05:34 +00:00
|
|
|
if (SND_DMA(b) && (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD))
|
|
|
|
sndbuf_dmabounce(b);
|
2005-06-10 21:33:14 +00:00
|
|
|
#endif
|
2001-03-24 23:10:29 +00:00
|
|
|
ret = CHANNEL_TRIGGER(c->methods, c->devinfo, go);
|
|
|
|
|
|
|
|
return ret;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_getptr(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
1999-12-05 19:09:13 +00:00
|
|
|
int hwptr;
|
|
|
|
int a = (1 << c->align) - 1;
|
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
|
|
|
hwptr = (c->flags & CHN_F_TRIGGERED)? CHANNEL_GETPTR(c->methods, c->devinfo) : 0;
|
1999-12-05 19:09:13 +00:00
|
|
|
/* don't allow unaligned values in the hwa ptr */
|
2001-03-24 23:10:29 +00:00
|
|
|
#if 1
|
1999-12-05 19:09:13 +00:00
|
|
|
hwptr &= ~a ; /* Apply channel align mask */
|
2001-03-24 23:10:29 +00:00
|
|
|
#endif
|
1999-12-05 19:09:13 +00:00
|
|
|
hwptr &= DMA_ALIGN_MASK; /* Apply DMA align mask */
|
|
|
|
return hwptr;
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
struct pcmchan_caps *
|
|
|
|
chn_getcaps(struct pcm_channel *c)
|
1999-09-01 04:08:39 +00:00
|
|
|
{
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
2000-12-18 01:36:41 +00:00
|
|
|
return CHANNEL_GETCAPS(c->methods, c->devinfo);
|
1999-09-01 04:08:39 +00:00
|
|
|
}
|
2000-08-20 22:18:56 +00:00
|
|
|
|
|
|
|
u_int32_t
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_getformats(struct pcm_channel *c)
|
2000-08-20 22:18:56 +00:00
|
|
|
{
|
|
|
|
u_int32_t *fmtlist, fmts;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
fmtlist = chn_getcaps(c)->fmtlist;
|
|
|
|
fmts = 0;
|
|
|
|
for (i = 0; fmtlist[i]; i++)
|
|
|
|
fmts |= fmtlist[i];
|
|
|
|
|
2002-02-24 00:49:43 +00:00
|
|
|
/* report software-supported formats */
|
|
|
|
if (report_soft_formats)
|
Whats New:
1. Support wide range sampling rate, as low as 1hz up to int32 max
(which is, insane) through new feeder_rate, multiple precisions
choice (32/64 bit converter). This is indeed, quite insane, but it
does give us more room and flexibility. Plenty sysctl options to
adjust resampling characteristics.
2. Support 24/32 bit pcm format conversion through new, much improved,
simplified and optimized feeder_fmt.
Changes:
1. buffer.c / dsp.c / sound.h
* Support for 24/32 AFMT.
2. feeder_rate.c
* New implementation of sampling rate conversion with 32/64 bit
precision, 1 - int32max hz (which is, ridiculous, yet very
addictive). Much improved / smarter buffer management to not
cause any missing samples at the end of conversion process
* Tunable sysctls for various aspect:
hw.snd.feeder_rate_ratemin - minimum allowable sampling rate
(default to 4000)
hw.snd.feeder_rate_ratemax - maximum allowable sampling rate
(default to 1102500)
hw.snd.feeder_rate_buffersize - conversion buffer size
(default to 8192)
hw.snd.feeder_rate_scaling - scaling / conversion method
(please refer to the source for explaination). Default to
previous implementation type.
3. feeder_fmt.c / sound.h
* New implementation, support for 24/32bit conversion, optimized,
and simplified. Few routines has been removed (8 to xlaw, 16 to
8). It just doesn't make sense.
4. channel.c
* Support for 24/32 AFMT
* Fix wrong xruns increment, causing incorrect underruns statistic
while using vchans.
5. vchan.c
* Support for 24/32 AFMT
* Proper speed / rate detection especially for fixed rate ac97.
User can override it using kernel hint:
hint.pcm.<unit>.vchanrate="xxxx".
Notes / Issues:
* Virtual Channels (vchans)
Enabling vchans can really, really help to solve overrun
issues. This is quite understandable, because it operates
entirely within its own buffering system without relying on
hardware interrupt / state. Even if you don't need vchan,
just enable single channel can help much. Few soundcards
(notably via8233x, sblive, possibly others) have their own
hardware multi channel, and this is unfortunately beyond
vchan reachability.
* The arrival of 24/32 also come with a price. Applications
that can do 24/32bit playback need to be recompiled (notably
mplayer). Use (recompiled) mplayer to experiment / test /
debug this various format using -af format=fmt. Note that
24bit seeking in mplayer is a little bit broken, sometimes
can cause silence or loud static noise. Pausing / seeking
few times can solve this problem.
You don't have to rebuild world entirely for this. Simply
copy /usr/src/sys/sys/soundcard.h to
/usr/include/sys/soundcard.h would suffice. Few drivers also
need recompilation, and this can be done via
/usr/src/sys/modules/sound/.
Support for 24bit hardware playback is beyond the scope of
this changes. That would require spessific hardware driver
changes.
* Don't expect playing 9999999999hz is a wise decision. Be
reasonable. The new feeder_rate implemention provide
flexibility, not insanity. You can easily chew up your CPU
with this kind of mind instability. Please use proper
mosquito repellent device for this obvious cracked brain
attempt. As for testing purposes, you can use (again)
mplayer to generate / play with different sampling rate. Use
something like "mplayer -af resample=192000:0:0 <files>".
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
Tested by: multimedia@
2005-07-31 16:16:22 +00:00
|
|
|
fmts |= AFMT_MU_LAW|AFMT_A_LAW|AFMT_U32_LE|AFMT_U32_BE|
|
|
|
|
AFMT_S32_LE|AFMT_S32_BE|AFMT_U24_LE|AFMT_U24_BE|
|
|
|
|
AFMT_S24_LE|AFMT_S24_BE|AFMT_U16_LE|AFMT_U16_BE|
|
2002-02-24 00:49:43 +00:00
|
|
|
AFMT_S16_LE|AFMT_S16_BE|AFMT_U8|AFMT_S8;
|
|
|
|
|
2000-08-20 22:18:56 +00:00
|
|
|
return fmts;
|
|
|
|
}
|
|
|
|
|
2000-09-23 22:11:32 +00:00
|
|
|
static int
|
2001-03-24 23:10:29 +00:00
|
|
|
chn_buildfeeder(struct pcm_channel *c)
|
2000-09-23 22:11:32 +00:00
|
|
|
{
|
2000-12-18 01:36:41 +00:00
|
|
|
struct feeder_class *fc;
|
2000-09-23 22:11:32 +00:00
|
|
|
struct pcm_feederdesc desc;
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
u_int32_t tmp[2], type, flags, hwfmt, *fmtlist;
|
2002-01-26 22:13:24 +00:00
|
|
|
int err;
|
2000-08-20 22:18:56 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
CHN_LOCKASSERT(c);
|
2000-09-23 22:11:32 +00:00
|
|
|
while (chn_removefeeder(c) == 0);
|
2000-12-18 01:36:41 +00:00
|
|
|
KASSERT((c->feeder == NULL), ("feeder chain not empty"));
|
2001-04-08 20:20:52 +00:00
|
|
|
|
2001-03-24 23:10:29 +00:00
|
|
|
c->align = sndbuf_getalign(c->bufsoft);
|
2001-04-08 20:20:52 +00:00
|
|
|
|
2001-05-27 17:22:00 +00:00
|
|
|
if (SLIST_EMPTY(&c->children)) {
|
|
|
|
fc = feeder_getclass(NULL);
|
2002-01-26 22:13:24 +00:00
|
|
|
KASSERT(fc != NULL, ("can't find root feeder"));
|
|
|
|
|
|
|
|
err = chn_addfeeder(c, fc, NULL);
|
|
|
|
if (err) {
|
|
|
|
DEB(printf("can't add root feeder, err %d\n", err));
|
|
|
|
|
|
|
|
return err;
|
2001-05-27 17:22:00 +00:00
|
|
|
}
|
|
|
|
c->feeder->desc->out = c->format;
|
|
|
|
} else {
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
if (c->flags & CHN_F_HAS_VCHAN) {
|
|
|
|
desc.type = FEEDER_MIXER;
|
|
|
|
desc.in = 0;
|
|
|
|
} else {
|
|
|
|
DEB(printf("can't decide which feeder type to use!\n"));
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
}
|
2001-05-27 17:22:00 +00:00
|
|
|
desc.out = c->format;
|
|
|
|
desc.flags = 0;
|
|
|
|
fc = feeder_getclass(&desc);
|
|
|
|
if (fc == NULL) {
|
|
|
|
DEB(printf("can't find vchan feeder\n"));
|
2002-01-26 22:13:24 +00:00
|
|
|
|
|
|
|
return EOPNOTSUPP;
|
2001-05-27 17:22:00 +00:00
|
|
|
}
|
2002-01-26 22:13:24 +00:00
|
|
|
|
|
|
|
err = chn_addfeeder(c, fc, &desc);
|
|
|
|
if (err) {
|
|
|
|
DEB(printf("can't add vchan feeder, err %d\n", err));
|
|
|
|
|
|
|
|
return err;
|
2001-05-27 17:22:00 +00:00
|
|
|
}
|
2001-04-08 20:20:52 +00:00
|
|
|
}
|
2005-10-02 15:37:40 +00:00
|
|
|
c->feederflags &= ~(1 << FEEDER_VOLUME);
|
|
|
|
if (c->direction == PCMDIR_PLAY &&
|
|
|
|
!(c->flags & CHN_F_VIRTUAL) &&
|
|
|
|
c->parentsnddev && (c->parentsnddev->flags & SD_F_SOFTVOL) &&
|
|
|
|
c->parentsnddev->mixer_dev)
|
|
|
|
c->feederflags |= 1 << FEEDER_VOLUME;
|
2000-09-23 22:11:32 +00:00
|
|
|
flags = c->feederflags;
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
fmtlist = chn_getcaps(c)->fmtlist;
|
2001-04-08 20:20:52 +00:00
|
|
|
|
2003-08-18 23:18:47 +00:00
|
|
|
DEB(printf("feederflags %x\n", flags));
|
2001-04-08 20:20:52 +00:00
|
|
|
|
2000-09-23 22:11:32 +00:00
|
|
|
for (type = FEEDER_RATE; type <= FEEDER_LAST; type++) {
|
|
|
|
if (flags & (1 << type)) {
|
|
|
|
desc.type = type;
|
|
|
|
desc.in = 0;
|
|
|
|
desc.out = 0;
|
|
|
|
desc.flags = 0;
|
|
|
|
DEB(printf("find feeder type %d, ", type));
|
2000-12-18 01:36:41 +00:00
|
|
|
fc = feeder_getclass(&desc);
|
update code dealing with snd_dbuf objects to do so using a functional interface
modify chn_setblocksize() to pick a default soft-blocksize appropriate to the
sample rate and format in use. it will aim for a power of two size small
enough to generate block sizes of at most 20ms. it will also set the
hard-blocksize taking into account rate/format conversions in use.
update drivers to implement setblocksize correctly:
updated, tested: sb16, emu10k1, maestro, solo
updated, untested: ad1816, ess, mss, sb8, csa
not updated: ds1, es137x, fm801, neomagic, t4dwave, via82c686
i lack hardware to test: ad1816, csa, fm801, neomagic
others will be updated/tested in the next few days.
2000-12-23 03:16:13 +00:00
|
|
|
DEB(printf("got %p\n", fc));
|
2001-04-08 20:20:52 +00:00
|
|
|
if (fc == NULL) {
|
|
|
|
DEB(printf("can't find required feeder type %d\n", type));
|
2002-01-26 22:13:24 +00:00
|
|
|
|
|
|
|
return EOPNOTSUPP;
|
2001-04-08 20:20:52 +00:00
|
|
|
}
|
|
|
|
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
if ((type == FEEDER_RATE &&
|
|
|
|
!fmtvalid(fc->desc->in, fmtlist))
|
|
|
|
|| c->feeder->desc->out != fc->desc->in) {
|
2003-08-18 23:18:47 +00:00
|
|
|
DEB(printf("build fmtchain from 0x%x to 0x%x: ", c->feeder->desc->out, fc->desc->in));
|
2001-04-08 20:20:52 +00:00
|
|
|
tmp[0] = fc->desc->in;
|
2000-09-23 22:11:32 +00:00
|
|
|
tmp[1] = 0;
|
2001-04-08 20:20:52 +00:00
|
|
|
if (chn_fmtchain(c, tmp) == 0) {
|
|
|
|
DEB(printf("failed\n"));
|
2002-01-26 22:13:24 +00:00
|
|
|
|
|
|
|
return ENODEV;
|
2001-04-08 20:20:52 +00:00
|
|
|
}
|
2000-09-23 22:11:32 +00:00
|
|
|
DEB(printf("ok\n"));
|
|
|
|
}
|
2001-04-08 20:20:52 +00:00
|
|
|
|
2002-01-26 22:13:24 +00:00
|
|
|
err = chn_addfeeder(c, fc, fc->desc);
|
|
|
|
if (err) {
|
2003-08-18 23:18:47 +00:00
|
|
|
DEB(printf("can't add feeder %p, output 0x%x, err %d\n", fc, fc->desc->out, err));
|
2002-01-26 22:13:24 +00:00
|
|
|
|
|
|
|
return err;
|
2001-04-08 20:20:52 +00:00
|
|
|
}
|
2003-08-18 23:18:47 +00:00
|
|
|
DEB(printf("added feeder %p, output 0x%x\n", fc, c->feeder->desc->out));
|
2000-09-23 22:11:32 +00:00
|
|
|
}
|
|
|
|
}
|
2001-04-08 20:20:52 +00:00
|
|
|
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
if (fmtvalid(c->feeder->desc->out, fmtlist)
|
|
|
|
&& !(c->direction == PCMDIR_REC &&
|
|
|
|
c->format != c->feeder->desc->out))
|
2002-01-23 05:10:56 +00:00
|
|
|
hwfmt = c->feeder->desc->out;
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
else {
|
2002-01-23 05:10:56 +00:00
|
|
|
if (c->direction == PCMDIR_REC) {
|
|
|
|
tmp[0] = c->format;
|
2002-08-22 21:24:01 +00:00
|
|
|
tmp[1] = 0;
|
2002-01-23 05:10:56 +00:00
|
|
|
hwfmt = chn_fmtchain(c, tmp);
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
} else
|
|
|
|
hwfmt = chn_fmtchain(c, fmtlist);
|
2000-09-23 22:11:32 +00:00
|
|
|
}
|
2001-04-08 20:20:52 +00:00
|
|
|
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
if (hwfmt == 0 || !fmtvalid(hwfmt, fmtlist)) {
|
|
|
|
DEB(printf("Invalid hardware format: 0x%x\n", hwfmt));
|
2002-01-26 22:13:24 +00:00
|
|
|
return ENODEV;
|
- channel.h
* New definition CHN_F_HAS_VCHAN.
- channel.c
* Use CHN_F_HAS_VCHAN to mark channel with vchan capability instead
of relying on SLIST_EMPTY(&channel->children) == true for better
clarification and future possible usages of children (like
'slave' channel).
* Various fixes, including blocksize / format bps allignment,
better 24bit seeking (mplayer, others).
* Improve format chain building, it's now possible to record something
to a format non-native to the soundcard through various feeder format
converters or to higher sampling rate. This also gains another feature,
like doing vchan mixing on non s16le soundcard such as sb8.
- sound.c
* Increase robustness within various function that handle vchan
creation / termination (these function need a total rewrite, but
that would cause other major rewrite within various places too!).
As far as its robustness can be guaranteed, leave it as is.
* Optimize channel ordering, prefer *real* hardware playback
channels over virtual channels. cat /dev/sndstat should look
better.
* Increase sndstat verbosity to include bufsoft/bufhard allocation.
- vchan.c
* Fix LOR 119.
- http://sources.zabbadoz.net/freebsd/lor.html#119
* Reorder / increase robustness of vchan_create() / destroy().
Enforce destroy_dev() during destroy operation, fix possible
panic / dangling character device.
- http://lists.freebsd.org/pipermail/freebsd-current/2005-May/050308.html
* Tolerate a little bit more during mixing process, this should help
non s16le soundcards.
Note: Recoring in a non-native rate/format may result in overruns. A friendly
application is wavrec from audio/wavplay. The problem is under
investigation.
Submitted by: Ariff Abdullah <skywizard@MyBSD.org.my>
2005-09-10 18:10:31 +00:00
|
|
|
}
|
2002-01-23 05:10:56 +00:00
|
|
|
|
|
|
|
sndbuf_setfmt(c->bufhard, hwfmt);
|
2002-01-26 22:13:24 +00:00
|
|
|
|
2005-10-02 15:37:40 +00:00
|
|
|
if ((flags & (1 << FEEDER_VOLUME))) {
|
|
|
|
int vol = 100 | (100 << 8);
|
|
|
|
|
|
|
|
CHN_UNLOCK(c);
|
|
|
|
/*
|
|
|
|
* XXX This is ugly! The way mixer subs being so secretive
|
|
|
|
* about its own internals force us to use this silly
|
|
|
|
* monkey trick.
|
|
|
|
*/
|
|
|
|
if (mixer_ioctl(c->parentsnddev->mixer_dev,
|
|
|
|
MIXER_READ(SOUND_MIXER_PCM), (caddr_t)&vol, -1, NULL) != 0)
|
|
|
|
device_printf(c->dev, "Soft Volume: Failed to read default value\n");
|
|
|
|
CHN_LOCK(c);
|
|
|
|
chn_setvolume(c, vol & 0x7f, (vol >> 8) & 0x7f);
|
|
|
|
}
|
|
|
|
|
2000-09-23 22:11:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2001-03-24 23:10:29 +00:00
|
|
|
|
2001-05-27 17:22:00 +00:00
|
|
|
int
|
|
|
|
chn_notify(struct pcm_channel *c, u_int32_t flags)
|
|
|
|
{
|
|
|
|
struct pcmchan_children *pce;
|
|
|
|
struct pcm_channel *child;
|
2001-06-07 20:06:22 +00:00
|
|
|
int run;
|
2001-05-27 17:22:00 +00:00
|
|
|
|
2004-01-28 08:02:15 +00:00
|
|
|
CHN_LOCK(c);
|
|
|
|
|
|
|
|
if (SLIST_EMPTY(&c->children)) {
|
|
|
|
CHN_UNLOCK(c);
|
2001-05-27 17:22:00 +00:00
|
|
|
return ENODEV;
|
2004-01-28 08:02:15 +00:00
|
|
|
}
|
2001-05-27 17:22:00 +00:00
|
|
|
|
2001-06-07 20:06:22 +00:00
|
|
|
run = (c->flags & CHN_F_TRIGGERED)? 1 : 0;
|
|
|
|
/*
|
|
|
|
* if the hwchan is running, we can't change its rate, format or
|
|
|
|
* blocksize
|
|
|
|
*/
|
|
|
|
if (run)
|
|
|
|
flags &= CHN_N_VOLUME | CHN_N_TRIGGER;
|
|
|
|
|
2001-05-27 17:22:00 +00:00
|
|
|
if (flags & CHN_N_RATE) {
|
|
|
|
/*
|
|
|
|
* we could do something here, like scan children and decide on
|
|
|
|
* the most appropriate rate to mix at, but we don't for now
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
if (flags & CHN_N_FORMAT) {
|
|
|
|
/*
|
|
|
|
* we could do something here, like scan children and decide on
|
|
|
|
* the most appropriate mixer feeder to use, but we don't for now
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
if (flags & CHN_N_VOLUME) {
|
|
|
|
/*
|
|
|
|
* we could do something here but we don't for now
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
if (flags & CHN_N_BLOCKSIZE) {
|
|
|
|
int blksz;
|
|
|
|
/*
|
|
|
|
* scan the children, find the lowest blocksize and use that
|
|
|
|
* for the hard blocksize
|
|
|
|
*/
|
|
|
|
blksz = sndbuf_getmaxsize(c->bufhard) / 2;
|
|
|
|
SLIST_FOREACH(pce, &c->children, link) {
|
|
|
|
child = pce->channel;
|
2004-01-28 08:02:15 +00:00
|
|
|
CHN_LOCK(child);
|
2001-05-27 17:22:00 +00:00
|
|
|
if (sndbuf_getblksz(child->bufhard) < blksz)
|
|
|
|
blksz = sndbuf_getblksz(child->bufhard);
|
2004-01-28 08:02:15 +00:00
|
|
|
CHN_UNLOCK(child);
|
2001-05-27 17:22:00 +00:00
|
|
|
}
|
|
|
|
chn_setblocksize(c, 2, blksz);
|
|
|
|
}
|
|
|
|
if (flags & CHN_N_TRIGGER) {
|
2001-06-07 20:06:22 +00:00
|
|
|
int nrun;
|
2001-05-27 17:22:00 +00:00
|
|
|
/*
|
|
|
|
* scan the children, and figure out if any are running
|
|
|
|
* if so, we need to be running, otherwise we need to be stopped
|
|
|
|
* if we aren't in our target sstate, move to it
|
|
|
|
*/
|
2001-06-07 20:06:22 +00:00
|
|
|
nrun = 0;
|
2001-05-27 17:22:00 +00:00
|
|
|
SLIST_FOREACH(pce, &c->children, link) {
|
|
|
|
child = pce->channel;
|
2004-01-28 08:02:15 +00:00
|
|
|
CHN_LOCK(child);
|
2001-05-27 17:22:00 +00:00
|
|
|
if (child->flags & CHN_F_TRIGGERED)
|
2001-06-07 20:06:22 +00:00
|
|
|
nrun = 1;
|
2004-01-28 08:02:15 +00:00
|
|
|
CHN_UNLOCK(child);
|
2001-05-27 17:22:00 +00:00
|
|
|
}
|
2001-06-07 20:06:22 +00:00
|
|
|
if (nrun && !run)
|
2001-05-27 17:22:00 +00:00
|
|
|
chn_start(c, 1);
|
2001-06-07 20:06:22 +00:00
|
|
|
if (!nrun && run)
|
2001-05-27 17:22:00 +00:00
|
|
|
chn_abort(c);
|
|
|
|
}
|
2004-01-28 08:02:15 +00:00
|
|
|
CHN_UNLOCK(c);
|
2001-05-27 17:22:00 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2004-01-28 08:02:15 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
chn_lock(struct pcm_channel *c)
|
|
|
|
{
|
|
|
|
CHN_LOCK(c);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
chn_unlock(struct pcm_channel *c)
|
|
|
|
{
|
|
|
|
CHN_UNLOCK(c);
|
|
|
|
}
|