diff options
Diffstat (limited to 'apps/codecs/libtremor')
-rw-r--r-- | apps/codecs/libtremor/asm_arm.h | 20 | ||||
-rw-r--r-- | apps/codecs/libtremor/asm_mcf5249.h | 12 | ||||
-rw-r--r-- | apps/codecs/libtremor/misc.h | 14 |
3 files changed, 0 insertions, 46 deletions
diff --git a/apps/codecs/libtremor/asm_arm.h b/apps/codecs/libtremor/asm_arm.h index 9531f21657..99790ea4b3 100644 --- a/apps/codecs/libtremor/asm_arm.h +++ b/apps/codecs/libtremor/asm_arm.h | |||
@@ -216,26 +216,6 @@ static inline void vect_copy(ogg_int32_t *x, const ogg_int32_t *y, int n) | |||
216 | #endif | 216 | #endif |
217 | 217 | ||
218 | #endif | 218 | #endif |
219 | /* not used anymore */ | ||
220 | /* | ||
221 | #ifndef _V_CLIP_MATH | ||
222 | #define _V_CLIP_MATH | ||
223 | |||
224 | static inline ogg_int32_t CLIP_TO_15(ogg_int32_t x) { | ||
225 | int tmp; | ||
226 | asm volatile("subs %1, %0, #32768\n\t" | ||
227 | "movpl %0, #0x7f00\n\t" | ||
228 | "orrpl %0, %0, #0xff\n" | ||
229 | "adds %1, %0, #32768\n\t" | ||
230 | "movmi %0, #0x8000" | ||
231 | : "+r"(x),"=r"(tmp) | ||
232 | : | ||
233 | : "cc"); | ||
234 | return(x); | ||
235 | } | ||
236 | |||
237 | #endif | ||
238 | */ | ||
239 | 219 | ||
240 | #ifndef _V_LSP_MATH_ASM | 220 | #ifndef _V_LSP_MATH_ASM |
241 | #define _V_LSP_MATH_ASM | 221 | #define _V_LSP_MATH_ASM |
diff --git a/apps/codecs/libtremor/asm_mcf5249.h b/apps/codecs/libtremor/asm_mcf5249.h index 621beadde8..3266113771 100644 --- a/apps/codecs/libtremor/asm_mcf5249.h +++ b/apps/codecs/libtremor/asm_mcf5249.h | |||
@@ -250,16 +250,4 @@ void vect_mult_bw(ogg_int32_t *data, LOOKUP_T *window, int n) | |||
250 | #endif | 250 | #endif |
251 | 251 | ||
252 | #endif | 252 | #endif |
253 | /* not used anymore */ | ||
254 | /* | ||
255 | #ifndef _V_CLIP_MATH | ||
256 | #define _V_CLIP_MATH | ||
257 | |||
258 | static inline ogg_int32_t CLIP_TO_15(register ogg_int32_t x) { | ||
259 | register ogg_int32_t hi=32767, lo=-32768; | ||
260 | return (x>=hi ? hi : (x<=lo ? lo : x)); | ||
261 | } | ||
262 | |||
263 | #endif | ||
264 | */ | ||
265 | #endif | 253 | #endif |
diff --git a/apps/codecs/libtremor/misc.h b/apps/codecs/libtremor/misc.h index 6b67740b0d..39f67057ab 100644 --- a/apps/codecs/libtremor/misc.h +++ b/apps/codecs/libtremor/misc.h | |||
@@ -203,20 +203,6 @@ static inline void vect_copy(ogg_int32_t *x, const ogg_int32_t *y, int n) | |||
203 | #endif | 203 | #endif |
204 | 204 | ||
205 | #endif | 205 | #endif |
206 | /* not used anymore */ | ||
207 | /* | ||
208 | #ifndef _V_CLIP_MATH | ||
209 | #define _V_CLIP_MATH | ||
210 | |||
211 | static inline ogg_int32_t CLIP_TO_15(ogg_int32_t x) { | ||
212 | int ret=x; | ||
213 | ret-= ((x<=32767)-1)&(x-32767); | ||
214 | ret-= ((x>=-32768)-1)&(x+32768); | ||
215 | return(ret); | ||
216 | } | ||
217 | |||
218 | #endif | ||
219 | */ | ||
220 | 206 | ||
221 | static inline ogg_int32_t VFLOAT_MULT(ogg_int32_t a,ogg_int32_t ap, | 207 | static inline ogg_int32_t VFLOAT_MULT(ogg_int32_t a,ogg_int32_t ap, |
222 | ogg_int32_t b,ogg_int32_t bp, | 208 | ogg_int32_t b,ogg_int32_t bp, |