From 3944d0ff3582457fa84132004a56479eae7f5a6b Mon Sep 17 00:00:00 2001 From: Ian Dowse Date: Sat, 23 Aug 2003 13:00:48 +0000 Subject: When calculating the block size to use for a particular sample rate, round the result up to a multiple of 4 bytes so that it will always be a multiple of the sample size. Also use the actual buffer size from sc->bufsz instead of the default DS1_BUFFSIZE. This fixes panics and bad distortion I have seen on Yamaha DS-1 hardware, mainly when playing certain Real Audio media. Reviewed by: orion (an earlier version of the patch) --- sys/dev/sound/pci/ds1.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c index 4acec376d7f0..dad3015215a5 100644 --- a/sys/dev/sound/pci/ds1.c +++ b/sys/dev/sound/pci/ds1.c @@ -526,12 +526,13 @@ static int ds1pchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) { struct sc_pchinfo *ch = data; + struct sc_info *sc = ch->parent; int drate; /* irq rate is fixed at 187.5hz */ drate = ch->spd * sndbuf_getbps(ch->buffer); - blocksize = (drate << 8) / DS1_IRQHZ; - sndbuf_resize(ch->buffer, DS1_BUFFSIZE / blocksize, blocksize); + blocksize = roundup2((drate << 8) / DS1_IRQHZ, 4); + sndbuf_resize(ch->buffer, sc->bufsz / blocksize, blocksize); return blocksize; } @@ -653,12 +654,13 @@ static int ds1rchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) { struct sc_rchinfo *ch = data; + struct sc_info *sc = ch->parent; int drate; /* irq rate is fixed at 187.5hz */ drate = ch->spd * sndbuf_getbps(ch->buffer); - blocksize = (drate << 8) / DS1_IRQHZ; - sndbuf_resize(ch->buffer, DS1_BUFFSIZE / blocksize, blocksize); + blocksize = roundup2((drate << 8) / DS1_IRQHZ, 4); + sndbuf_resize(ch->buffer, sc->bufsz / blocksize, blocksize); return blocksize; } -- cgit v1.3