mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: split IN_T into two separate constants

Browse Source 
Split IN_T into BSIZE and ITYPE, to avoid expansion if the OS has
defined macros for the intX_t and uintX_t types. The IN_T constant is
then defined in mixeng_template.h so it can be used by the
functions/macros on this header file.

This change has been tested successfully under Debian Linux and NetBSD
6.0BETA.

Cc: Vassili Karpov (malc) <av1474@comtv.ru>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
Roger Pau Monne 2012-05-18 12:08:14 +01:00 committed by malc
parent ace2e4dad7
commit a28853871d
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
audio/mixeng.c
View File

@ -33,7 +33,8 @@
#define ENDIAN_CONVERT(v) (v) #define ENDIAN_CONVERT(v) (v)
/* Signed 8 bit */ /* Signed 8 bit */
#define IN_T int8_t #define BSIZE 8
#define ITYPE int
#define IN_MIN SCHAR_MIN #define IN_MIN SCHAR_MIN
#define IN_MAX SCHAR_MAX #define IN_MAX SCHAR_MAX
#define SIGNED #define SIGNED
@ -42,25 +43,29 @@
#undef SIGNED #undef SIGNED
#undef IN_MAX #undef IN_MAX
#undef IN_MIN #undef IN_MIN
#undef IN_T #undef BSIZE
#undef ITYPE
#undef SHIFT #undef SHIFT
/* Unsigned 8 bit */ /* Unsigned 8 bit */
#define IN_T uint8_t #define BSIZE 8
#define ITYPE uint
#define IN_MIN 0 #define IN_MIN 0
#define IN_MAX UCHAR_MAX #define IN_MAX UCHAR_MAX
#define SHIFT 8 #define SHIFT 8
#include "mixeng_template.h" #include "mixeng_template.h"
#undef IN_MAX #undef IN_MAX
#undef IN_MIN #undef IN_MIN
#undef IN_T #undef BSIZE
#undef ITYPE
#undef SHIFT #undef SHIFT
#undef ENDIAN_CONVERT #undef ENDIAN_CONVERT
#undef ENDIAN_CONVERSION #undef ENDIAN_CONVERSION
/* Signed 16 bit */ /* Signed 16 bit */
#define IN_T int16_t #define BSIZE 16
#define ITYPE int
#define IN_MIN SHRT_MIN #define IN_MIN SHRT_MIN
#define IN_MAX SHRT_MAX #define IN_MAX SHRT_MAX
#define SIGNED #define SIGNED
@ -78,11 +83,13 @@
#undef SIGNED #undef SIGNED
#undef IN_MAX #undef IN_MAX
#undef IN_MIN #undef IN_MIN
#undef IN_T #undef BSIZE
#undef ITYPE
#undef SHIFT #undef SHIFT
/* Unsigned 16 bit */ /* Unsigned 16 bit */
#define IN_T uint16_t #define BSIZE 16
#define ITYPE uint
#define IN_MIN 0 #define IN_MIN 0
#define IN_MAX USHRT_MAX #define IN_MAX USHRT_MAX
#define SHIFT 16 #define SHIFT 16
@ -98,11 +105,13 @@
#undef ENDIAN_CONVERSION #undef ENDIAN_CONVERSION
#undef IN_MAX #undef IN_MAX
#undef IN_MIN #undef IN_MIN
#undef IN_T #undef BSIZE
#undef ITYPE
#undef SHIFT #undef SHIFT
/* Signed 32 bit */ /* Signed 32 bit */
#define IN_T int32_t #define BSIZE 32
#define ITYPE int
#define IN_MIN INT32_MIN #define IN_MIN INT32_MIN
#define IN_MAX INT32_MAX #define IN_MAX INT32_MAX
#define SIGNED #define SIGNED
@ -120,11 +129,13 @@
#undef SIGNED #undef SIGNED
#undef IN_MAX #undef IN_MAX
#undef IN_MIN #undef IN_MIN
#undef IN_T #undef BSIZE
#undef ITYPE
#undef SHIFT #undef SHIFT
/* Unsigned 32 bit */ /* Unsigned 32 bit */
#define IN_T uint32_t #define BSIZE 32
#define ITYPE uint
#define IN_MIN 0 #define IN_MIN 0
#define IN_MAX UINT32_MAX #define IN_MAX UINT32_MAX
#define SHIFT 32 #define SHIFT 32
@ -140,7 +151,8 @@
#undef ENDIAN_CONVERSION #undef ENDIAN_CONVERSION
#undef IN_MAX #undef IN_MAX
#undef IN_MIN #undef IN_MIN
#undef IN_T #undef BSIZE
#undef ITYPE
#undef SHIFT #undef SHIFT
t_sample *mixeng_conv[2][2][2][3] = { t_sample *mixeng_conv[2][2][2][3] = {

4
audio/mixeng_template.h
View File

@ -31,7 +31,8 @@
#define HALF (IN_MAX >> 1) #define HALF (IN_MAX >> 1)
#endif #endif
#define ET glue (ENDIAN_CONVERSION, glue (_, IN_T)) #define ET glue (ENDIAN_CONVERSION, glue (glue (glue (_, ITYPE), BSIZE), _t))
#define IN_T glue (glue (ITYPE, BSIZE), _t)
#ifdef FLOAT_MIXENG #ifdef FLOAT_MIXENG
static mixeng_real inline glue (conv_, ET) (IN_T v) static mixeng_real inline glue (conv_, ET) (IN_T v)
@ -150,3 +151,4 @@ static void glue (glue (clip_, ET), _from_mono)
#undef ET #undef ET
#undef HALF #undef HALF
#undef IN_T