Module Name: src
Committed By: nia
Date: Mon Oct 19 09:07:29 UTC 2020
Modified Files:
src/lib/libossaudio: ossaudio.c
Log Message:
ossaudio(3): these ioctls need to return samples, not bytes
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/lib/libossaudio/ossaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.50 src/lib/libossaudio/ossaudio.c:1.51
--- src/lib/libossaudio/ossaudio.c:1.50 Mon Oct 19 09:01:24 2020
+++ src/lib/libossaudio/ossaudio.c Mon Oct 19 09:07:29 2020
@@ -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, v
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, v
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:
