projects
/
sdk
/
emulator
/
qemu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync with latest
[sdk/emulator/qemu.git]
/
audio
/
mixeng_template.h
diff --git
a/audio/mixeng_template.h
b/audio/mixeng_template.h
index
a2d0ef8
..
30849a6
100644
(file)
--- a/
audio/mixeng_template.h
+++ b/
audio/mixeng_template.h
@@
-31,7
+31,8
@@
#define HALF (IN_MAX >> 1)
#endif
#define HALF (IN_MAX >> 1)
#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
static mixeng_real inline glue (conv_, ET) (IN_T v)
#ifdef FLOAT_MIXENG
static mixeng_real inline glue (conv_, ET) (IN_T v)
@@
-46,7
+47,7
@@
static mixeng_real inline glue (conv_, ET) (IN_T v)
#endif
#else /* !RECIPROCAL */
#ifdef SIGNED
#endif
#else /* !RECIPROCAL */
#ifdef SIGNED
- return nv / (mixeng_real) (IN_MAX - IN_MIN);
+ return nv / (mixeng_real) (
(mixeng_real)
IN_MAX - IN_MIN);
#else
return (nv - HALF) / (mixeng_real) IN_MAX;
#endif
#else
return (nv - HALF) / (mixeng_real) IN_MAX;
#endif
@@
-63,7
+64,7
@@
static IN_T inline glue (clip_, ET) (mixeng_real v)
}
#ifdef SIGNED
}
#ifdef SIGNED
- return ENDIAN_CONVERT ((IN_T) (v * (IN_MAX - IN_MIN)));
+ return ENDIAN_CONVERT ((IN_T) (v * (
(mixeng_real)
IN_MAX - IN_MIN)));
#else
return ENDIAN_CONVERT ((IN_T) ((v * IN_MAX) + HALF));
#endif
#else
return ENDIAN_CONVERT ((IN_T) ((v * IN_MAX) + HALF));
#endif
@@
-150,3
+151,4
@@
static void glue (glue (clip_, ET), _from_mono)
#undef ET
#undef HALF
#undef ET
#undef HALF
+#undef IN_T