Mercurial > libavcodec.hg
changeset 3602:38b7b3629249 libavcodec
indent preprocessor directives
| author | michael |
|---|---|
| date | Tue, 22 Aug 2006 11:16:47 +0000 |
| parents | 99a352dc1601 |
| children | 42b6cefc6c1a |
| files | mpegaudiodec.c |
| diffstat | 1 files changed, 21 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegaudiodec.c Tue Aug 22 11:11:04 2006 +0000 +++ b/mpegaudiodec.c Tue Aug 22 11:16:47 2006 +0000 @@ -36,7 +36,7 @@ /* define USE_HIGHPRECISION to have a bit exact (but slower) mpeg audio decoder */ #ifdef CONFIG_MPEGAUDIO_HP -#define USE_HIGHPRECISION +# define USE_HIGHPRECISION #endif #include "mpegaudio.h" @@ -750,26 +750,21 @@ return sum1; } -#if defined(ARCH_POWERPC_405) - -/* signed 16x16 -> 32 multiply add accumulate */ -#define MACS(rt, ra, rb) \ - asm ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb)); - -/* signed 16x16 -> 32 multiply */ -#define MULS(ra, rb) \ - ({ int __rt; asm ("mullhw %0, %1, %2" : "=r" (__rt) : "r" (ra), "r" (rb)); __rt; }) +# if defined(ARCH_POWERPC_405) + /* signed 16x16 -> 32 multiply add accumulate */ +# define MACS(rt, ra, rb) \ + asm ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb)); -#else - -/* signed 16x16 -> 32 multiply add accumulate */ -#define MACS(rt, ra, rb) rt += (ra) * (rb) + /* signed 16x16 -> 32 multiply */ +# define MULS(ra, rb) \ + ({ int __rt; asm ("mullhw %0, %1, %2" : "=r" (__rt) : "r" (ra), "r" (rb)); __rt; }) +# else + /* signed 16x16 -> 32 multiply add accumulate */ +# define MACS(rt, ra, rb) rt += (ra) * (rb) -/* signed 16x16 -> 32 multiply */ -#define MULS(ra, rb) ((ra) * (rb)) - -#endif - + /* signed 16x16 -> 32 multiply */ +# define MULS(ra, rb) ((ra) * (rb)) +# endif #else static inline int round_sample(int64_t *sum) @@ -784,13 +779,13 @@ return sum1; } -#ifdef ARCH_X86 -/* ask gcc devels why this is 3 times faster then the generic code below */ -#define MULS(ra, rb) \ - ({ int64_t rt; asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb)); rt; }) -#else -#define MULS(ra, rb) MUL64(ra, rb) -#endif +# ifdef ARCH_X86 + /* ask gcc devels why this is 3 times faster then the generic code below */ +# define MULS(ra, rb) \ + ({ int64_t rt; asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb)); rt; }) +# else +# define MULS(ra, rb) MUL64(ra, rb) +# endif #endif #define SUM8(sum, op, w, p) \