summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2006-03-18 14:31:26 +0000
committerjmcneill <jmcneill@NetBSD.org>2006-03-18 14:31:26 +0000
commitaca78114dcd9d13c5eb0f7ee753f504976a98ea4 (patch)
tree082719823f5ac876c7f6d975fff8f75588c45857 /sys/dev
parent36ab9cfe6be23b08100f6404b514f1f30e3017a8 (diff)
Revert local changes not meant for previous commit.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/auconv.c52
1 files changed, 2 insertions, 50 deletions
diff --git a/sys/dev/auconv.c b/sys/dev/auconv.c
index f149d965e36..fb23e51ffb3 100644
--- a/sys/dev/auconv.c
+++ b/sys/dev/auconv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auconv.c,v 1.16 2006/03/18 13:12:15 jmcneill Exp $ */
+/* $NetBSD: auconv.c,v 1.17 2006/03/18 14:31:26 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.16 2006/03/18 13:12:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.17 2006/03/18 14:31:26 jmcneill Exp $");
#include <sys/types.h>
#include <sys/audioio.h>
@@ -465,52 +465,6 @@ DEFINE_FILTER(linear16_to_linear8)
return 0;
}
-DEFINE_FILTER(linear16_to_linear32)
-{
- stream_filter_t *this;
- int m, err, enc_dst, enc_src;
-
- this = (stream_filter_t *)self;
- max_used = (max_used + 1) & ~1;
- if ((err = this->prev->fetch_to(this->prev, this->src, max_used / 2)))
- return err;
- m = (dst->end - dst->start) & ~1;
- m = min(m, max_used);
- enc_dst = dst->param.encoding;
- enc_src = this->src->param.encoding;
- if (enc_src == AUDIO_ENCODING_SLINEAR_LE &&
- enc_dst == AUDIO_ENCODING_SLINEAR_LE) {
- FILTER_LOOP_PROLOGUE(this->src, 2, dst, 4, m) {
- d[0] = s[0];
- d[1] = 0;
- d[2] = s[1];
- d[3] = 0;
- } FILTER_LOOP_EPILOGUE(this->src, dst);
- }
-
- return 0;
-}
-
-DEFINE_FILTER(interleave32_2ch_to_8ch)
-{
- stream_filter_t *this;
- int m, err;
-
- this = (stream_filter_t *)self;
- max_used = (max_used + 1) & ~1;
- if ((err = this->prev->fetch_to(this->prev, this->src, max_used / 2)))
- return err;
- m = (dst->end - dst->start) & ~1;
- m = min(m, max_used);
-
- FILTER_LOOP_PROLOGUE(this->src, 4, dst, 16, m) {
- memcpy(d, s, 4);
- memset(d, 0, 12);
- } FILTER_LOOP_EPILOGUE(this->src, dst);
-
- return 0;
-}
-
/**
* Set appropriate parameters in `param,' and return the index in
* the hardware capability array `formats.'
@@ -1114,7 +1068,6 @@ static int
auconv_add_encoding(int enc, int prec, int flags,
struct audio_encoding_set **buf, int *capacity)
{
-#ifndef AUCONV_DEBUG
static const char *encoding_names[] = {
NULL, AudioEmulaw, AudioEalaw, NULL,
NULL, AudioEadpcm, AudioEslinear_le, AudioEslinear_be,
@@ -1124,7 +1077,6 @@ auconv_add_encoding(int enc, int prec, int flags,
AudioEmpeg_l1_system, AudioEmpeg_l2_stream,
AudioEmpeg_l2_packets, AudioEmpeg_l2_system
};
-#endif
struct audio_encoding_set *set;
struct audio_encoding_set *new_buf;
audio_encoding_t *e;