Module Name: src
Committed By: jmcneill
Date: Tue Sep 6 01:20:18 UTC 2011
Modified Files:
src/lib/libossaudio: ossaudio.c soundcard.h
Log Message:
Add support for AFMT_AC3
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/lib/libossaudio/ossaudio.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libossaudio/soundcard.h
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.24 src/lib/libossaudio/ossaudio.c:1.25
--- src/lib/libossaudio/ossaudio.c:1.24 Mon Apr 28 20:23:01 2008
+++ src/lib/libossaudio/ossaudio.c Tue Sep 6 01:20:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.24 2008/04/28 20:23:01 martin Exp $ */
+/* $NetBSD: ossaudio.c,v 1.25 2011/09/06 01:20:18 jmcneill Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: ossaudio.c,v 1.24 2008/04/28 20:23:01 martin Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.25 2011/09/06 01:20:18 jmcneill Exp $");
/*
* This is an OSS (Linux) sound API emulator.
@@ -185,6 +185,12 @@
tmpinfo.play.encoding =
tmpinfo.record.encoding = AUDIO_ENCODING_ULINEAR_BE;
break;
+ case AFMT_AC3:
+ tmpinfo.play.precision =
+ tmpinfo.record.precision = 16;
+ tmpinfo.play.encoding =
+ tmpinfo.record.encoding = AUDIO_ENCODING_AC3;
+ break;
default:
return EINVAL;
}
@@ -228,6 +234,9 @@
case AUDIO_ENCODING_ADPCM:
idat = AFMT_IMA_ADPCM;
break;
+ case AUDIO_ENCODING_AC3:
+ idat = AFMT_AC3;
+ break;
}
INTARG = idat;
break;
@@ -328,6 +337,9 @@
case AUDIO_ENCODING_ADPCM:
idat |= AFMT_IMA_ADPCM;
break;
+ case AUDIO_ENCODING_AC3:
+ idat |= AFMT_AC3;
+ break;
default:
break;
}
Index: src/lib/libossaudio/soundcard.h
diff -u src/lib/libossaudio/soundcard.h:1.18 src/lib/libossaudio/soundcard.h:1.19
--- src/lib/libossaudio/soundcard.h:1.18 Mon Apr 28 20:23:01 2008
+++ src/lib/libossaudio/soundcard.h Tue Sep 6 01:20:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: soundcard.h,v 1.18 2008/04/28 20:23:01 martin Exp $ */
+/* $NetBSD: soundcard.h,v 1.19 2011/09/06 01:20:18 jmcneill Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -59,6 +59,7 @@
#define AFMT_U16_LE 0x00000080
#define AFMT_U16_BE 0x00000100
#define AFMT_MPEG 0x00000200
+#define AFMT_AC3 0x00000400
#define SNDCTL_DSP_SAMPLESIZE SNDCTL_DSP_SETFMT
#define SOUND_PCM_READ_BITS _IOR ('P', 5, int)
#define SNDCTL_DSP_CHANNELS _IOWR('P', 6, int)
