Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev Remove 24 bit in a 32 bit container filters.
details: https://anonhg.NetBSD.org/src/rev/5078431b4eea
branches: trunk
changeset: 827654:5078431b4eea
user: nat <nat%NetBSD.org@localhost>
date: Tue Nov 07 01:15:42 2017 +0000
description:
Remove 24 bit in a 32 bit container filters.
At present this filter did not work well and has caused problems with
the audio mixer disabled for hdaudio(4).
These filters may return when they are fixed.
diffstat:
sys/dev/auconv.c | 24 ++----------------------
sys/dev/auconv.h | 6 +-----
2 files changed, 3 insertions(+), 27 deletions(-)
diffs (177 lines):
diff -r 2b47fe0c744e -r 5078431b4eea sys/dev/auconv.c
--- a/sys/dev/auconv.c Tue Nov 07 01:13:19 2017 +0000
+++ b/sys/dev/auconv.c Tue Nov 07 01:15:42 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auconv.c,v 1.33 2017/10/02 07:06:15 nat Exp $ */
+/* $NetBSD: auconv.c,v 1.34 2017/11/07 01:15:42 nat Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.33 2017/10/02 07:06:15 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.34 2017/11/07 01:15:42 nat Exp $");
#include <sys/types.h>
#include <sys/audioio.h>
@@ -141,7 +141,6 @@
*/
static const struct conv_table s8_table[] = {
TABLE_LIST(32, 32, 8)
- TABLE_LIST(24, 32, 8)
TABLE_LIST(24, 24, 8)
TABLE_LIST(16, 16, 8)
TABLE_LIST(8, 8, 8)
@@ -151,7 +150,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table u8_table[] = {
TABLE_LIST(32, 32, 8)
- TABLE_LIST(24, 32, 8)
TABLE_LIST(24, 24, 8)
TABLE_LIST(16, 16, 8)
TABLE_LIST(8, 8, 8)
@@ -161,7 +159,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table s16le_table[] = {
TABLE_LIST(32, 32, 16)
- TABLE_LIST(24, 32, 16)
TABLE_LIST(24, 24, 16)
TABLE_LIST(16, 16, 16)
TABLE_LIST(8, 8, 16)
@@ -171,7 +168,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table s16be_table[] = {
TABLE_LIST(32, 32, 16)
- TABLE_LIST(24, 32, 16)
TABLE_LIST(24, 24, 16)
TABLE_LIST(16, 16, 16)
TABLE_LIST(8, 8, 16)
@@ -181,7 +177,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table u16le_table[] = {
TABLE_LIST(32, 32, 16)
- TABLE_LIST(24, 32, 16)
TABLE_LIST(24, 24, 16)
TABLE_LIST(16, 16, 16)
TABLE_LIST(8, 8, 16)
@@ -191,7 +186,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table u16be_table[] = {
TABLE_LIST(32, 32, 16)
- TABLE_LIST(24, 32, 16)
TABLE_LIST(24, 24, 16)
TABLE_LIST(16, 16, 16)
TABLE_LIST(8, 8, 16)
@@ -202,7 +196,6 @@
#ifdef notdef
static const struct conv_table s24le_table[] = {
TABLE_LIST(32, 32, 24)
- TABLE_LIST(24, 32, 24)
TABLE_LIST(24, 24, 24)
TABLE_LIST(16, 16, 24)
TABLE_LIST(8, 8, 24)
@@ -212,7 +205,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table s24be_table[] = {
TABLE_LIST(32, 32, 24)
- TABLE_LIST(24, 32, 24)
TABLE_LIST(24, 24, 24)
TABLE_LIST(16, 16, 24)
TABLE_LIST(8, 8, 24)
@@ -222,7 +214,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table u24le_table[] = {
TABLE_LIST(32, 32, 24)
- TABLE_LIST(24, 32, 24)
TABLE_LIST(24, 24, 24)
TABLE_LIST(16, 16, 24)
TABLE_LIST(8, 8, 24)
@@ -232,7 +223,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table u24be_table[] = {
TABLE_LIST(32, 32, 24)
- TABLE_LIST(24, 32, 24)
TABLE_LIST(24, 24, 24)
TABLE_LIST(16, 16, 24)
TABLE_LIST(8, 8, 24)
@@ -243,7 +233,6 @@
#endif
static const struct conv_table s32le_table[] = {
TABLE_LIST(32, 32, 32)
- TABLE_LIST(24, 32, 32)
TABLE_LIST(24, 24, 32)
TABLE_LIST(16, 16, 32)
TABLE_LIST(8, 8, 32)
@@ -253,7 +242,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table s32be_table[] = {
TABLE_LIST(32, 32, 32)
- TABLE_LIST(24, 32, 32)
TABLE_LIST(24, 24, 32)
TABLE_LIST(16, 16, 32)
TABLE_LIST(8, 8, 32)
@@ -263,7 +251,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table u32le_table[] = {
TABLE_LIST(32, 32, 32)
- TABLE_LIST(24, 32, 32)
TABLE_LIST(24, 24, 32)
TABLE_LIST(16, 16, 32)
TABLE_LIST(8, 8, 32)
@@ -273,7 +260,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table u32be_table[] = {
TABLE_LIST(32, 32, 32)
- TABLE_LIST(24, 32, 32)
TABLE_LIST(24, 24, 32)
TABLE_LIST(16, 16, 32)
TABLE_LIST(8, 8, 32)
@@ -312,7 +298,6 @@
static const struct conv_table mulaw_table[] = {
MULAW_LIST(32, 32, 32)
- MULAW_LIST(24, 32, 24)
MULAW_LIST(24, 24, 24)
MULAW_LIST(16, 16, 16)
{AUDIO_ENCODING_SLINEAR_LE, 8, 8,
@@ -322,7 +307,6 @@
{0, 0, 0, NULL, NULL}};
static const struct conv_table alaw_table[] = {
ALAW_LIST(32, 32, 32)
- ALAW_LIST(24, 32, 24)
ALAW_LIST(24, 24, 24)
ALAW_LIST(16, 16, 16)
{AUDIO_ENCODING_SLINEAR_LE, 8, 8,
@@ -708,10 +692,6 @@
LINEARN_LINEAR(32, 32, 24);
LINEARN_LINEAR(32, 32, 16);
LINEARN_LINEAR(32, 32, 8);
-LINEARN_LINEAR(24, 32, 32);
-LINEARN_LINEAR(24, 32, 24);
-LINEARN_LINEAR(24, 32, 16);
-LINEARN_LINEAR(24, 32, 8);
LINEARN_LINEAR(24, 24, 32);
LINEARN_LINEAR(24, 24, 24);
LINEARN_LINEAR(24, 24, 16);
diff -r 2b47fe0c744e -r 5078431b4eea sys/dev/auconv.h
--- a/sys/dev/auconv.h Tue Nov 07 01:13:19 2017 +0000
+++ b/sys/dev/auconv.h Tue Nov 07 01:15:42 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: auconv.h,v 1.19 2017/07/27 23:39:37 nat Exp $ */
+/* $NetBSD: auconv.h,v 1.20 2017/11/07 01:15:42 nat Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -66,10 +66,6 @@
extern stream_filter_factory_t linear32_32_to_linear24;
extern stream_filter_factory_t linear32_32_to_linear16;
extern stream_filter_factory_t linear32_32_to_linear8;
-extern stream_filter_factory_t linear24_32_to_linear32;
-extern stream_filter_factory_t linear24_32_to_linear24;
-extern stream_filter_factory_t linear24_32_to_linear16;
-extern stream_filter_factory_t linear24_32_to_linear8;
extern stream_filter_factory_t linear24_24_to_linear32;
extern stream_filter_factory_t linear24_24_to_linear24;
extern stream_filter_factory_t linear24_24_to_linear16;
Home |
Main Index |
Thread Index |
Old Index