From 5c319d33348c59761fb80d524e58f50d8aaf4fb7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Sat, 16 Feb 2008 19:18:30 +0000 Subject: [PATCH] clean up definition of DECLARE_ALIGNED_8 and STRIDE_ALIGN Originally committed as revision 12126 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dsputil.h | 45 ++++++--------------------------------------- 1 file changed, 6 insertions(+), 39 deletions(-) diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index ec0b500..2b9f7b4 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -527,40 +527,14 @@ static inline void emms(void) emms();\ } -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) - -#define STRIDE_ALIGN 8 - void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_ARMV4L) -/* This is to use 4 bytes read to the IDCT pointers for some 'zero' - line optimizations */ -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(4, t, v) -#define STRIDE_ALIGN 4 - #define MM_IWMMXT 0x0100 /* XScale IWMMXT */ extern int mm_flags; -#elif defined(HAVE_MLIB) - -/* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 - -#elif defined(HAVE_VIS) - -/* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 - -#elif defined(ARCH_ALPHA) - -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 - #elif defined(ARCH_POWERPC) #define MM_ALTIVEC 0x0001 /* standard AltiVec */ @@ -575,21 +549,14 @@ extern int mm_flags; #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) #define STRIDE_ALIGN 16 -#elif defined(ARCH_SH4) - -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 - -#elif defined(ARCH_BFIN) - -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 - -#else +#endif -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 +#ifndef DECLARE_ALIGNED_8 +# define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) +#endif +#ifndef STRIDE_ALIGN +# define STRIDE_ALIGN 8 #endif /* PSNR */ -- 2.7.4