diff options
| author | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2005-04-14 01:24:21 +0000 |
|---|---|---|
| committer | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2005-04-14 01:24:21 +0000 |
| commit | 9609b6d4441f0f950da1655f5f1a6817463c3563 (patch) | |
| tree | aaaa4a1babfe41a0fc854e986623d6dc1447a0b4 /sys/dev/mulaw.h | |
| parent | 607cde395c115fec3d17b16dcb246f81b79c490e (diff) | |
Correct signed/unsigned mismatches in compatibility macros and add
mono-to-stereo variants for mulaw_to_slinear16
ok dlg@ jason@ mickey@
Diffstat (limited to 'sys/dev/mulaw.h')
| -rw-r--r-- | sys/dev/mulaw.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/dev/mulaw.h b/sys/dev/mulaw.h index d7e5d2f3234..6d2c2d54828 100644 --- a/sys/dev/mulaw.h +++ b/sys/dev/mulaw.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mulaw.h,v 1.11 2004/02/23 23:59:21 deraadt Exp $ */ +/* $OpenBSD: mulaw.h,v 1.12 2005/04/14 01:24:20 pascoe Exp $ */ /* $NetBSD: mulaw.h,v 1.11 1999/11/01 18:12:19 augustss Exp $ */ /*- @@ -46,7 +46,9 @@ extern void mulaw_to_ulinear16_be(void *, u_char *, int); extern void mulaw_to_ulinear16_be_mts(void *, u_char *, int); /* Convert 8-bit mu-law to/from 16 bit signed linear. */ extern void mulaw_to_slinear16_le(void *, u_char *, int); +extern void mulaw_to_slinear16_le_mts(void *, u_char *, int); extern void mulaw_to_slinear16_be(void *, u_char *, int); +extern void mulaw_to_slinear16_be_mts(void *, u_char *, int); extern void slinear16_to_mulaw_le(void *, u_char *, int); /* Convert 8-bit mu-law to/from 8 bit unsigned linear. */ extern void mulaw_to_ulinear8(void *, u_char *, int); @@ -76,17 +78,17 @@ void mulaw_to_alaw(void *, u_char *, int); /* backwards compat for now */ #if BYTE_ORDER == LITTLE_ENDIAN -#define mulaw_to_ulinear16 mulaw_to_slinear16_le +#define mulaw_to_ulinear16 mulaw_to_ulinear16_le #define alaw_to_ulinear16 alaw_to_ulinear16_le -#define mulaw_to_slinear16 mulaw_to_ulinear16_le -#define mulaw_to_slinear16_mts mulaw_to_ulinear16_le_mts +#define mulaw_to_slinear16 mulaw_to_slinear16_le +#define mulaw_to_slinear16_mts mulaw_to_slinear16_le_mts #define alaw_to_slinear16 alaw_to_slinear16_le #define alaw_to_slinear16_mts alaw_to_slinear16_le_mts #else -#define mulaw_to_ulinear16 mulaw_to_slinear16_be +#define mulaw_to_ulinear16 mulaw_to_ulinear16_be #define alaw_to_ulinear16 alaw_to_ulinear16_be -#define mulaw_to_slinear16 mulaw_to_ulinear16_be -#define mulaw_to_slinear16_mts mulaw_to_ulinear16_be_mts +#define mulaw_to_slinear16 mulaw_to_slinear16_be +#define mulaw_to_slinear16_mts mulaw_to_slinear16_be_mts #define alaw_to_slinear16 alaw_to_slinear16_be #define alaw_to_slinear16_mts alaw_to_slinear16_be_mts #endif |