comparison dsputil.h @ 11369:98970e51365a libavcodec

Remove DECLARE_ALIGNED_{8,16} macros These macros are redundant. All uses are replaced with the generic DECLARE_ALIGNED macro instead.
author mru
date Sat, 06 Mar 2010 14:24:59 +0000
parents 3d4f64b8fb10
children 4b3da727d832
comparison
equal deleted inserted replaced
11368:3d4f64b8fb10 11369:98970e51365a
707 #define LOCAL_ALIGNED(a, t, v, s, ...) \ 707 #define LOCAL_ALIGNED(a, t, v, s, ...) \
708 uint8_t la_##v[sizeof(t s __VA_ARGS__) + (a)]; \ 708 uint8_t la_##v[sizeof(t s __VA_ARGS__) + (a)]; \
709 t (*v) __VA_ARGS__ = (void *)FFALIGN((uintptr_t)la_##v, a) 709 t (*v) __VA_ARGS__ = (void *)FFALIGN((uintptr_t)la_##v, a)
710 710
711 #if HAVE_LOCAL_ALIGNED_8 711 #if HAVE_LOCAL_ALIGNED_8
712 # define LOCAL_ALIGNED_8(t, v, s, ...) DECLARE_ALIGNED_8(t, v) s __VA_ARGS__ 712 # define LOCAL_ALIGNED_8(t, v, s, ...) DECLARE_ALIGNED(8, t, v) s __VA_ARGS__
713 #else 713 #else
714 # define LOCAL_ALIGNED_8(t, v, s, ...) LOCAL_ALIGNED(8, t, v, s, __VA_ARGS__) 714 # define LOCAL_ALIGNED_8(t, v, s, ...) LOCAL_ALIGNED(8, t, v, s, __VA_ARGS__)
715 #endif 715 #endif
716 716
717 #if HAVE_LOCAL_ALIGNED_16 717 #if HAVE_LOCAL_ALIGNED_16
718 # define LOCAL_ALIGNED_16(t, v, s, ...) DECLARE_ALIGNED_16(t, v) s __VA_ARGS__ 718 # define LOCAL_ALIGNED_16(t, v, s, ...) DECLARE_ALIGNED(16, t, v) s __VA_ARGS__
719 #else 719 #else
720 # define LOCAL_ALIGNED_16(t, v, s, ...) LOCAL_ALIGNED(16, t, v, s, __VA_ARGS__) 720 # define LOCAL_ALIGNED_16(t, v, s, ...) LOCAL_ALIGNED(16, t, v, s, __VA_ARGS__)
721 #endif 721 #endif
722 722
723 /* PSNR */ 723 /* PSNR */
767 #define SINTABLE_CONST 767 #define SINTABLE_CONST
768 #define SINETABLE_CONST 768 #define SINETABLE_CONST
769 #endif 769 #endif
770 770
771 #define COSTABLE(size) \ 771 #define COSTABLE(size) \
772 COSTABLE_CONST DECLARE_ALIGNED_16(FFTSample, ff_cos_##size)[size/2] 772 COSTABLE_CONST DECLARE_ALIGNED(16, FFTSample, ff_cos_##size)[size/2]
773 #define SINTABLE(size) \ 773 #define SINTABLE(size) \
774 SINTABLE_CONST DECLARE_ALIGNED_16(FFTSample, ff_sin_##size)[size/2] 774 SINTABLE_CONST DECLARE_ALIGNED(16, FFTSample, ff_sin_##size)[size/2]
775 #define SINETABLE(size) \ 775 #define SINETABLE(size) \
776 SINETABLE_CONST DECLARE_ALIGNED_16(float, ff_sine_##size)[size] 776 SINETABLE_CONST DECLARE_ALIGNED(16, float, ff_sine_##size)[size]
777 extern COSTABLE(16); 777 extern COSTABLE(16);
778 extern COSTABLE(32); 778 extern COSTABLE(32);
779 extern COSTABLE(64); 779 extern COSTABLE(64);
780 extern COSTABLE(128); 780 extern COSTABLE(128);
781 extern COSTABLE(256); 781 extern COSTABLE(256);