Commit fd14f64a authored by michael's avatar michael

indent preprocessor directives


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6047 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 6a1e8973
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/* define USE_HIGHPRECISION to have a bit exact (but slower) mpeg /* define USE_HIGHPRECISION to have a bit exact (but slower) mpeg
audio decoder */ audio decoder */
#ifdef CONFIG_MPEGAUDIO_HP #ifdef CONFIG_MPEGAUDIO_HP
#define USE_HIGHPRECISION # define USE_HIGHPRECISION
#endif #endif
#include "mpegaudio.h" #include "mpegaudio.h"
...@@ -750,26 +750,21 @@ static inline int round_sample(int *sum) ...@@ -750,26 +750,21 @@ static inline int round_sample(int *sum)
return sum1; return sum1;
} }
#if defined(ARCH_POWERPC_405) # if defined(ARCH_POWERPC_405)
/* signed 16x16 -> 32 multiply add accumulate */
/* signed 16x16 -> 32 multiply add accumulate */ # define MACS(rt, ra, rb) \
#define MACS(rt, ra, rb) \
asm ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb)); asm ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb));
/* signed 16x16 -> 32 multiply */ /* signed 16x16 -> 32 multiply */
#define MULS(ra, rb) \ # define MULS(ra, rb) \
({ int __rt; asm ("mullhw %0, %1, %2" : "=r" (__rt) : "r" (ra), "r" (rb)); __rt; }) ({ 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)
#else /* signed 16x16 -> 32 multiply */
# define MULS(ra, rb) ((ra) * (rb))
/* signed 16x16 -> 32 multiply add accumulate */ # endif
#define MACS(rt, ra, rb) rt += (ra) * (rb)
/* signed 16x16 -> 32 multiply */
#define MULS(ra, rb) ((ra) * (rb))
#endif
#else #else
static inline int round_sample(int64_t *sum) static inline int round_sample(int64_t *sum)
...@@ -784,13 +779,13 @@ static inline int round_sample(int64_t *sum) ...@@ -784,13 +779,13 @@ static inline int round_sample(int64_t *sum)
return sum1; return sum1;
} }
#ifdef ARCH_X86 # ifdef ARCH_X86
/* ask gcc devels why this is 3 times faster then the generic code below */ /* ask gcc devels why this is 3 times faster then the generic code below */
#define MULS(ra, rb) \ # define MULS(ra, rb) \
({ int64_t rt; asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb)); rt; }) ({ int64_t rt; asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb)); rt; })
#else # else
#define MULS(ra, rb) MUL64(ra, rb) # define MULS(ra, rb) MUL64(ra, rb)
#endif # endif
#endif #endif
#define SUM8(sum, op, w, p) \ #define SUM8(sum, op, w, p) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment