diff options
author | Mohamed Tarek <mt@rockbox.org> | 2010-07-17 08:00:13 +0000 |
---|---|---|
committer | Mohamed Tarek <mt@rockbox.org> | 2010-07-17 08:00:13 +0000 |
commit | b3399635671a0f3664d09bb04ec954bc65b4a986 (patch) | |
tree | c3aa5ea7c2c0e437ce57229e095c4aa46022800f /apps/codecs/libwmapro/wmapro_math.h | |
parent | 0f947104100131069fbfa9e53c8ef129c4716a30 (diff) | |
download | rockbox-b3399635671a0f3664d09bb04ec954bc65b4a986.tar.gz rockbox-b3399635671a0f3664d09bb04ec954bc65b4a986.zip |
libwmapro : Rename all FIXED occurrances to int32_t and remove types.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27454 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libwmapro/wmapro_math.h')
-rw-r--r-- | apps/codecs/libwmapro/wmapro_math.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/apps/codecs/libwmapro/wmapro_math.h b/apps/codecs/libwmapro/wmapro_math.h index 4614bcbe56..823c002c09 100644 --- a/apps/codecs/libwmapro/wmapro_math.h +++ b/apps/codecs/libwmapro/wmapro_math.h | |||
@@ -2,14 +2,13 @@ | |||
2 | #define _WMAPRO_MATH_H_ | 2 | #define _WMAPRO_MATH_H_ |
3 | 3 | ||
4 | #include <inttypes.h> | 4 | #include <inttypes.h> |
5 | #include "types.h" | ||
6 | 5 | ||
7 | #define fixtof16(x) (float)((float)(x) / (float)(1 << 16)) | 6 | #define fixtof16(x) (float)((float)(x) / (float)(1 << 16)) |
8 | #define fixtof31(x) (float)((float)(x) / (float)(1 << 31)) | 7 | #define fixtof31(x) (float)((float)(x) / (float)(1 << 31)) |
9 | #define ftofix16(x) ((int32_t)((x) * (float)(1 << 16) + ((x) < 0 ? -0.5:0.5))) | 8 | #define ftofix16(x) ((int32_t)((x) * (float)(1 << 16) + ((x) < 0 ? -0.5:0.5))) |
10 | #define ftofix31(x) ((int32_t)((x) * (float)(1 << 31) + ((x) < 0 ? -0.5:0.5))) | 9 | #define ftofix31(x) ((int32_t)((x) * (float)(1 << 31) + ((x) < 0 ? -0.5:0.5))) |
11 | 10 | ||
12 | static inline FIXED fixmulshift(FIXED x, FIXED y, int shamt) | 11 | static inline int32_t fixmulshift(int32_t x, int32_t y, int shamt) |
13 | { | 12 | { |
14 | int64_t temp; | 13 | int64_t temp; |
15 | temp = x; | 14 | temp = x; |
@@ -21,26 +20,26 @@ static inline FIXED fixmulshift(FIXED x, FIXED y, int shamt) | |||
21 | } | 20 | } |
22 | 21 | ||
23 | 22 | ||
24 | static inline void vector_fixmul_window(FIXED *dst, const FIXED *src0, | 23 | static inline void vector_fixmul_window(int32_t *dst, const int32_t *src0, |
25 | const FIXED *src1, const FIXED *win, | 24 | const int32_t *src1, const int32_t *win, |
26 | FIXED add_bias, int len) | 25 | int32_t add_bias, int len) |
27 | { | 26 | { |
28 | int i, j; | 27 | int i, j; |
29 | dst += len; | 28 | dst += len; |
30 | win += len; | 29 | win += len; |
31 | src0+= len; | 30 | src0+= len; |
32 | for(i=-len, j=len-1; i<0; i++, j--) { | 31 | for(i=-len, j=len-1; i<0; i++, j--) { |
33 | FIXED s0 = src0[i]; | 32 | int32_t s0 = src0[i]; |
34 | FIXED s1 = src1[j]; | 33 | int32_t s1 = src1[j]; |
35 | FIXED wi = win[i]; | 34 | int32_t wi = win[i]; |
36 | FIXED wj = win[j]; | 35 | int32_t wj = win[j]; |
37 | dst[i] = fixmulshift(s0,-1*wj,31) - fixmulshift(s1,-1*wi,31) + (add_bias<<16); | 36 | dst[i] = fixmulshift(s0,-1*wj,31) - fixmulshift(s1,-1*wi,31) + (add_bias<<16); |
38 | dst[j] = fixmulshift(s0,-1*wi,31) + fixmulshift(s1,-1*wj,31) + (add_bias<<16); | 37 | dst[j] = fixmulshift(s0,-1*wi,31) + fixmulshift(s1,-1*wj,31) + (add_bias<<16); |
39 | } | 38 | } |
40 | 39 | ||
41 | } | 40 | } |
42 | 41 | ||
43 | static inline void vector_fixmul_scalar(FIXED *dst, const FIXED *src, FIXED mul, | 42 | static inline void vector_fixmul_scalar(int32_t *dst, const int32_t *src, int32_t mul, |
44 | int len, int shift) | 43 | int len, int shift) |
45 | { | 44 | { |
46 | int i; | 45 | int i; |