diff options
Diffstat (limited to 'apps/codecs/libcook')
-rw-r--r-- | apps/codecs/libcook/cook_fixpoint.h | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/apps/codecs/libcook/cook_fixpoint.h b/apps/codecs/libcook/cook_fixpoint.h index 33646125dd..b17d99eeeb 100644 --- a/apps/codecs/libcook/cook_fixpoint.h +++ b/apps/codecs/libcook/cook_fixpoint.h | |||
@@ -40,20 +40,9 @@ | |||
40 | #include "asm_arm.h" | 40 | #include "asm_arm.h" |
41 | #include "asm_mcf5249.h" | 41 | #include "asm_mcf5249.h" |
42 | #include "codeclib_misc.h" | 42 | #include "codeclib_misc.h" |
43 | #include "codeclib.h" | ||
43 | #endif | 44 | #endif |
44 | 45 | ||
45 | /* The following table is taken from libavutil/mathematics.c */ | ||
46 | const uint8_t ff_log2_tab[256] ={ | ||
47 | 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, | ||
48 | 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, | ||
49 | 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, | ||
50 | 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, | ||
51 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, | ||
52 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, | ||
53 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, | ||
54 | 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 | ||
55 | }; | ||
56 | |||
57 | /* cplscales was moved from cookdata_fixpoint.h since only * | 46 | /* cplscales was moved from cookdata_fixpoint.h since only * |
58 | * cook_fixpoint.h should see/use it. */ | 47 | * cook_fixpoint.h should see/use it. */ |
59 | static const FIXPU* cplscales[5] = { | 48 | static const FIXPU* cplscales[5] = { |
@@ -114,24 +103,6 @@ static inline int32_t fixmul31(int32_t x, int32_t y) | |||
114 | } | 103 | } |
115 | #endif | 104 | #endif |
116 | 105 | ||
117 | /* math functions taken from libavutil/common.h */ | ||
118 | |||
119 | static inline int av_log2(unsigned int v) | ||
120 | { | ||
121 | int n = 0; | ||
122 | if (v & 0xffff0000) { | ||
123 | v >>= 16; | ||
124 | n += 16; | ||
125 | } | ||
126 | if (v & 0xff00) { | ||
127 | v >>= 8; | ||
128 | n += 8; | ||
129 | } | ||
130 | n += ff_log2_tab[v]; | ||
131 | |||
132 | return n; | ||
133 | } | ||
134 | |||
135 | /** | 106 | /** |
136 | * Clips a signed integer value into the amin-amax range. | 107 | * Clips a signed integer value into the amin-amax range. |
137 | * @param a value to clip | 108 | * @param a value to clip |