Module Name: src
Committed By: jmcneill
Date: Tue Sep 6 01:16:44 UTC 2011
Modified Files:
src/sys/dev: auconv.c audio.c
src/sys/sys: audioio.h
Log Message:
Add AUDIO_ENCODING_AC3 encoding type.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/auconv.c
cvs rdiff -u -r1.252 -r1.253 src/sys/dev/audio.c
cvs rdiff -u -r1.33 -r1.34 src/sys/sys/audioio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/auconv.c
diff -u src/sys/dev/auconv.c:1.22 src/sys/dev/auconv.c:1.23
--- src/sys/dev/auconv.c:1.22 Sat Jan 3 03:43:21 2009
+++ src/sys/dev/auconv.c Tue Sep 6 01:16:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auconv.c,v 1.22 2009/01/03 03:43:21 yamt Exp $ */
+/* $NetBSD: auconv.c,v 1.23 2011/09/06 01:16:44 jmcneill Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.22 2009/01/03 03:43:21 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.23 2011/09/06 01:16:44 jmcneill Exp $");
#include <sys/types.h>
#include <sys/audioio.h>
@@ -205,7 +205,8 @@
AudioEslinear, AudioEulinear,
AudioEmpeg_l1_stream, AudioEmpeg_l1_packets,
AudioEmpeg_l1_system, AudioEmpeg_l2_stream,
- AudioEmpeg_l2_packets, AudioEmpeg_l2_system
+ AudioEmpeg_l2_packets, AudioEmpeg_l2_system,
+ AudioEac3
};
#endif
@@ -825,7 +826,7 @@
/**
* XXX we need encoding-dependent check.
* XXX Is to check precision/channels meaningful for
- * MPEG encodings?
+ * MPEG/AC3 encodings?
*/
if (formats[i].validbits != param->validbits)
continue;
@@ -1036,6 +1037,7 @@
case AUDIO_ENCODING_MPEG_L2_STREAM:
case AUDIO_ENCODING_MPEG_L2_PACKETS:
case AUDIO_ENCODING_MPEG_L2_SYSTEM:
+ case AUDIO_ENCODING_AC3:
ADD_ENCODING(formats[i].encoding,
formats[i].precision, 0);
break;
@@ -1075,7 +1077,8 @@
AudioEslinear, AudioEulinear,
AudioEmpeg_l1_stream, AudioEmpeg_l1_packets,
AudioEmpeg_l1_system, AudioEmpeg_l2_stream,
- AudioEmpeg_l2_packets, AudioEmpeg_l2_system
+ AudioEmpeg_l2_packets, AudioEmpeg_l2_system,
+ AudioEac3
};
struct audio_encoding_set *set;
struct audio_encoding_set *new_buf;
Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.252 src/sys/dev/audio.c:1.253
--- src/sys/dev/audio.c:1.252 Sat Nov 20 18:03:49 2010
+++ src/sys/dev/audio.c Tue Sep 6 01:16:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.252 2010/11/20 18:03:49 tsutsui Exp $ */
+/* $NetBSD: audio.c,v 1.253 2011/09/06 01:16:44 jmcneill Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.252 2010/11/20 18:03:49 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.253 2011/09/06 01:16:44 jmcneill Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -1845,6 +1845,7 @@
case AUDIO_ENCODING_MPEG_L2_STREAM:
case AUDIO_ENCODING_MPEG_L2_PACKETS:
case AUDIO_ENCODING_MPEG_L2_SYSTEM:
+ case AUDIO_ENCODING_AC3:
case AUDIO_ENCODING_ADPCM: /* is this right XXX */
case AUDIO_ENCODING_SLINEAR_LE:
case AUDIO_ENCODING_SLINEAR_BE:
@@ -2972,6 +2973,7 @@
case AUDIO_ENCODING_MPEG_L2_STREAM:
case AUDIO_ENCODING_MPEG_L2_PACKETS:
case AUDIO_ENCODING_MPEG_L2_SYSTEM:
+ case AUDIO_ENCODING_AC3:
break;
default:
return EINVAL;
Index: src/sys/sys/audioio.h
diff -u src/sys/sys/audioio.h:1.33 src/sys/sys/audioio.h:1.34
--- src/sys/sys/audioio.h:1.33 Tue Sep 29 15:58:54 2009
+++ src/sys/sys/audioio.h Tue Sep 6 01:16:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: audioio.h,v 1.33 2009/09/29 15:58:54 sborrill Exp $ */
+/* $NetBSD: audioio.h,v 1.34 2011/09/06 01:16:43 jmcneill Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -132,6 +132,7 @@
#define AUDIO_ENCODING_MPEG_L2_STREAM 15
#define AUDIO_ENCODING_MPEG_L2_PACKETS 16
#define AUDIO_ENCODING_MPEG_L2_SYSTEM 17
+#define AUDIO_ENCODING_AC3 18
typedef struct audio_encoding {
int index;
@@ -325,6 +326,7 @@
#define AudioEmpeg_l2_stream "mpeg_l2_stream"
#define AudioEmpeg_l2_packets "mpeg_l2_packets"
#define AudioEmpeg_l2_system "mpeg_l2_system"
+#define AudioEac3 "ac3"
#define AudioCinputs "inputs"
#define AudioCoutputs "outputs"
