devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Eep, didn't mean to commit those other files

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24820 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Hooper 2010-02-21 21:17:53 +00:00
parent 3c52395b57
commit 0b5338a6e9
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/codecs/lib/SOURCES
View file

@ -4,14 +4,14 @@ fixedpoint.c
/* OLD MDCT */ /* OLD MDCT */
/* (when all other codecs are remediated this can be remoed) */ /* (when all other codecs are remediated this can be remoed) */
/* mdct2.c */ mdct2.c
mdct_lookup.c mdct_lookup.c
fft-ffmpeg.c fft-ffmpeg.c
mdct.c mdct.c
#ifdef CPU_ARM #ifdef CPU_ARM
/*mdct_arm.S*/ mdct_arm.S
setjmp_arm.S setjmp_arm.S
../../../firmware/target/arm/support-arm.S ../../../firmware/target/arm/support-arm.S
#endif #endif

13
apps/codecs/lib/asm_arm.h
View file

@ -226,11 +226,14 @@ void vect_mult_bw(int32_t *data, int32_t *window, int n)
#define _V_CLIP_MATH #define _V_CLIP_MATH
static inline int32_t CLIP_TO_15(int32_t x) { static inline int32_t CLIP_TO_15(int32_t x) {
const int32_t mask = 0xffff7fff; int tmp;
asm volatile("teq %0,%0,asr #31\n\t" asm volatile("subs %1, %0, #32768\n\t"
"eorne %0,%1,%0,asr #31\n\t" "movpl %0, #0x7f00\n\t"
: "+r"(x) "orrpl %0, %0, #0xff\n"
: "r" (mask) "adds %1, %0, #32768\n\t"
"movmi %0, #0x8000"
: "+r"(x),"=r"(tmp)
:
: "cc"); : "cc");
return(x); return(x);
} }

2
apps/codecs/lib/codeclib.h
View file

@ -65,7 +65,7 @@ void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, con
/*MDCT library functions*/ /*MDCT library functions*/
/* -1- Tremor mdct */ /* -1- Tremor mdct */
/* extern void mdct_backward(int n, int32_t *in, int32_t *out); */ extern void mdct_backward(int n, int32_t *in, int32_t *out);
/* -2- ffmpeg fft-based mdct */ /* -2- ffmpeg fft-based mdct */
extern void ff_imdct_half(unsigned int nbits, int32_t *output, const int32_t *input); extern void ff_imdct_half(unsigned int nbits, int32_t *output, const int32_t *input);
extern void ff_imdct_calc(unsigned int nbits, int32_t *output, const int32_t *input); extern void ff_imdct_calc(unsigned int nbits, int32_t *output, const int32_t *input);