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

ossaudio(3): these ioctls need to return samples, not bytes

This commit is contained in:
nia 2020-10-19 09:07:29 +00:00
parent 27ca241ed7
commit 028d2f4db2
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libossaudio/ossaudio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ossaudio.c,v 1.50 2020/10/19 09:01:24 nia Exp $ */
/* $NetBSD: ossaudio.c,v 1.51 2020/10/19 09:07:29 nia Exp $ */
/*-
* Copyright (c) 1997, 2020 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: ossaudio.c,v 1.50 2020/10/19 09:01:24 nia Exp $");
__RCSID("$NetBSD: ossaudio.c,v 1.51 2020/10/19 09:07:29 nia Exp $");
/*
* This is an Open Sound System compatibility layer, which provides
@ -584,8 +584,12 @@ audio_ioctl(int fd, unsigned long com, void *argp)
return retval;
/* XXX: 'samples' may wrap */
memset(osscount.filler, 0, sizeof(osscount.filler));
osscount.samples = tmpinfo.record.samples;
osscount.fifo_samples = tmpinfo.record.seek;
osscount.samples = tmpinfo.record.samples /
((tmpinfo.record.precision / NBBY) *
tmpinfo.record.channels);
osscount.fifo_samples = tmpinfo.record.seek /
((tmpinfo.record.precision / NBBY) *
tmpinfo.record.channels);
*(oss_count_t *)argp = osscount;
break;
case SNDCTL_DSP_GETOPTR:
@ -603,8 +607,12 @@ audio_ioctl(int fd, unsigned long com, void *argp)
return retval;
/* XXX: 'samples' may wrap */
memset(osscount.filler, 0, sizeof(osscount.filler));
osscount.samples = tmpinfo.play.samples;
osscount.fifo_samples = tmpinfo.play.seek;
osscount.samples = tmpinfo.play.samples /
((tmpinfo.play.precision / NBBY) *
tmpinfo.play.channels);
osscount.fifo_samples = tmpinfo.play.seek /
((tmpinfo.play.precision / NBBY) *
tmpinfo.play.channels);
*(oss_count_t *)argp = osscount;
break;
case SNDCTL_DSP_SETPLAYVOL: