From 68b51e58ce73d99d2cd9bfa14cb7daaf4a74047e Mon Sep 17 00:00:00 2001 From: Steve L'Homme Date: Sun, 5 Feb 2006 13:35:17 +0000 Subject: MSVC-compatible __align8/__align16 declaration patch by Steve Lhomme, steve .dot. lhomme .at. free .dot. fr Originally committed as revision 4942 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/4xm.c | 2 +- libavcodec/asv1.c | 6 +++--- libavcodec/dsputil.c | 14 +++++++------- libavcodec/dsputil.h | 29 +++++++++++++++++++---------- libavcodec/dv.c | 8 ++++---- libavcodec/h264.c | 10 +++++----- libavcodec/i386/dsputil_h264_template_mmx.c | 8 ++++---- libavcodec/i386/dsputil_mmx.c | 6 +++--- libavcodec/i386/mpegvideo_mmx_template.c | 2 +- libavcodec/i386/vp3dsp_sse2.c | 6 +++--- libavcodec/imgresample.c | 4 ++-- libavcodec/mdec.c | 6 +++--- libavcodec/mjpeg.c | 2 +- libavcodec/mpegvideo.c | 2 +- libavcodec/mpegvideo.h | 4 ++-- libavcodec/ppc/dsputil_h264_altivec.c | 26 +++++++++++++------------- libavcodec/vp3.c | 8 ++++---- libavcodec/wmadec.c | 10 +++++----- libavcodec/wmv2.c | 2 +- 19 files changed, 82 insertions(+), 73 deletions(-) diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 381e8553f6..3ca2338d24 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -121,7 +121,7 @@ typedef struct FourXContext{ int mv[256]; VLC pre_vlc; int last_dc; - DCTELEM __align8 block[6][64]; + DECLARE_ALIGNED_8(DCTELEM, block[6][64]); uint8_t *bitstream_buffer; unsigned int bitstream_buffer_size; CFrameBuffer cfrm[CFRAME_BUFFER_COUNT]; diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c index 99e563ee9f..1cb15d812d 100644 --- a/libavcodec/asv1.c +++ b/libavcodec/asv1.c @@ -44,9 +44,9 @@ typedef struct ASV1Context{ int mb_height; int mb_width2; int mb_height2; - DCTELEM __align8 block[6][64]; - uint16_t __align8 intra_matrix[64]; - int __align8 q_intra_matrix[64]; + DECLARE_ALIGNED_8(DCTELEM, block[6][64]); + DECLARE_ALIGNED_8(uint16_t, intra_matrix[64]); + DECLARE_ALIGNED_8(int, q_intra_matrix[64]); uint8_t *bitstream_buffer; unsigned int bitstream_buffer_size; } ASV1Context; diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index f9f1be60ee..e7435a20b9 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -62,7 +62,7 @@ const uint8_t ff_zigzag248_direct[64] = { }; /* not permutated inverse zigzag_direct + 1 for MMX quantizer */ -uint16_t __align8 inv_zigzag_direct16[64] = {0, }; +DECLARE_ALIGNED_8(uint16_t, inv_zigzag_direct16[64]) = {0, }; const uint8_t ff_alternate_horizontal_scan[64] = { 0, 1, 2, 3, 8, 9, 16, 17, @@ -3402,7 +3402,7 @@ static int hadamard8_intra8x8_c(/*MpegEncContext*/ void *s, uint8_t *src, uint8_ static int dct_sad8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ MpegEncContext * const s= (MpegEncContext *)c; - uint64_t __align8 aligned_temp[sizeof(DCTELEM)*64/8]; + DECLARE_ALIGNED_8(uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]); DCTELEM * const temp= (DCTELEM*)aligned_temp; int sum=0, i; @@ -3472,7 +3472,7 @@ static int dct264_sad8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *s static int dct_max8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ MpegEncContext * const s= (MpegEncContext *)c; - uint64_t __align8 aligned_temp[sizeof(DCTELEM)*64/8]; + DECLARE_ALIGNED_8(uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]); DCTELEM * const temp= (DCTELEM*)aligned_temp; int sum=0, i; @@ -3491,7 +3491,7 @@ void simple_idct(DCTELEM *block); //FIXME static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ MpegEncContext * const s= (MpegEncContext *)c; - uint64_t __align8 aligned_temp[sizeof(DCTELEM)*64*2/8]; + DECLARE_ALIGNED_8 (uint64_t, aligned_temp[sizeof(DCTELEM)*64*2/8]); DCTELEM * const temp= (DCTELEM*)aligned_temp; DCTELEM * const bak = ((DCTELEM*)aligned_temp)+64; int sum=0, i; @@ -3516,8 +3516,8 @@ static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *s static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ MpegEncContext * const s= (MpegEncContext *)c; const uint8_t *scantable= s->intra_scantable.permutated; - uint64_t __align8 aligned_temp[sizeof(DCTELEM)*64/8]; - uint64_t __align8 aligned_bak[stride]; + DECLARE_ALIGNED_8 (uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]); + DECLARE_ALIGNED_8 (uint64_t, aligned_bak[stride]); DCTELEM * const temp= (DCTELEM*)aligned_temp; uint8_t * const bak= (uint8_t*)aligned_bak; int i, last, run, bits, level, distoration, start_i; @@ -3595,7 +3595,7 @@ static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int static int bit8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ MpegEncContext * const s= (MpegEncContext *)c; const uint8_t *scantable= s->intra_scantable.permutated; - uint64_t __align8 aligned_temp[sizeof(DCTELEM)*64/8]; + DECLARE_ALIGNED_8 (uint64_t, aligned_temp[sizeof(DCTELEM)*64/8]); DCTELEM * const temp= (DCTELEM*)aligned_temp; int i, last, run, bits, level, start_i; const int esc_length= s->ac_esc_length; diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 88bb66c582..5cfde2f5ef 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -390,7 +390,11 @@ static inline int get_penalty_factor(int lambda, int lambda2, int type){ one or more MultiMedia extension */ int mm_support(void); -#define __align16 __attribute__ ((aligned (16))) +#ifdef __GNUC__ + #define DECLARE_ALIGNED_16(t,v) t v __attribute__ ((aligned (16))) +#else + #define DECLARE_ALIGNED_16(t,v) __declspec(align(16)) t v +#endif #if defined(HAVE_MMX) @@ -421,7 +425,12 @@ static inline void emms(void) emms();\ } -#define __align8 __attribute__ ((aligned (8))) +#ifdef __GNUC__ + #define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) +#else + #define DECLARE_ALIGNED_8(t,v) __declspec(align(8)) t v +#endif + #define STRIDE_ALIGN 8 void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx); @@ -431,7 +440,7 @@ void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); /* This is to use 4 bytes read to the IDCT pointers for some 'zero' line optimizations */ -#define __align8 __attribute__ ((aligned (4))) +#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (4))) #define STRIDE_ALIGN 4 #define MM_IWMMXT 0x0100 /* XScale IWMMXT */ @@ -443,7 +452,7 @@ void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx); #elif defined(HAVE_MLIB) /* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ -#define __align8 __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) #define STRIDE_ALIGN 8 void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx); @@ -451,13 +460,13 @@ void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_SPARC) /* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ -#define __align8 __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) #define STRIDE_ALIGN 8 void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_ALPHA) -#define __align8 __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) #define STRIDE_ALIGN 8 void dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx); @@ -474,28 +483,28 @@ extern int mm_flags; #undef pixel #endif -#define __align8 __attribute__ ((aligned (16))) +#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (16))) #define STRIDE_ALIGN 16 void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx); #elif defined(HAVE_MMI) -#define __align8 __attribute__ ((aligned (16))) +#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (16))) #define STRIDE_ALIGN 16 void dsputil_init_mmi(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_SH4) -#define __align8 __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) #define STRIDE_ALIGN 8 void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); #else -#define __align8 __attribute__ ((aligned (8))) +#define DECLARE_ALIGNED_8(t,v) t v __attribute__ ((aligned (8))) #define STRIDE_ALIGN 8 #endif diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 55f35ee1a5..08611a9000 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -379,9 +379,9 @@ static inline void dv_decode_video_segment(DVVideoContext *s, PutBitContext pb, vs_pb; GetBitContext gb; BlockInfo mb_data[5 * 6], *mb, *mb1; - DCTELEM sblock[5*6][64] __align8; - uint8_t mb_bit_buffer[80 + 4] __align8; /* allow some slack */ - uint8_t vs_bit_buffer[5 * 80 + 4] __align8; /* allow some slack */ + DECLARE_ALIGNED_8(DCTELEM, sblock[5*6][64]); + DECLARE_ALIGNED_8(uint8_t, mb_bit_buffer[80 + 4]); /* allow some slack */ + DECLARE_ALIGNED_8(uint8_t, vs_bit_buffer[5 * 80 + 4]); /* allow some slack */ const int log2_blocksize= 3-s->avctx->lowres; assert((((int)mb_bit_buffer)&7)==0); @@ -779,7 +779,7 @@ static inline void dv_encode_video_segment(DVVideoContext *s, uint8_t* data; uint8_t* ptr; int do_edge_wrap; - DCTELEM block[64] __align8; + DECLARE_ALIGNED_8(DCTELEM, block[64]); EncBlockInfo enc_blks[5*6]; PutBitContext pbs[5*6]; PutBitContext* pb; diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 080cfc4b12..e80a3992c2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -199,14 +199,14 @@ typedef struct H264Context{ * non zero coeff count cache. * is 64 if not available. */ - uint8_t non_zero_count_cache[6*8] __align8; + DECLARE_ALIGNED_8(uint8_t, non_zero_count_cache[6*8]); uint8_t (*non_zero_count)[16]; /** * Motion vector cache. */ - int16_t mv_cache[2][5*8][2] __align8; - int8_t ref_cache[2][5*8] __align8; + DECLARE_ALIGNED_8(int16_t, mv_cache[2][5*8][2]); + DECLARE_ALIGNED_8(int8_t, ref_cache[2][5*8]); #define LIST_NOT_USED -1 //FIXME rename? #define PART_NOT_AVAILABLE -2 @@ -335,7 +335,7 @@ typedef struct H264Context{ GetBitContext *intra_gb_ptr; GetBitContext *inter_gb_ptr; - DCTELEM mb[16*24] __align8; + DECLARE_ALIGNED_8(DCTELEM, mb[16*24]); /** * Cabac @@ -352,7 +352,7 @@ typedef struct H264Context{ uint8_t *chroma_pred_mode_table; int last_qscale_diff; int16_t (*mvd_table[2])[2]; - int16_t mvd_cache[2][5*8][2] __align8; + DECLARE_ALIGNED_8(int16_t, mvd_cache[2][5*8][2]); uint8_t *direct_table; uint8_t direct_cache[5*8]; diff --git a/libavcodec/i386/dsputil_h264_template_mmx.c b/libavcodec/i386/dsputil_h264_template_mmx.c index 8099132be6..d52938ccf4 100644 --- a/libavcodec/i386/dsputil_h264_template_mmx.c +++ b/libavcodec/i386/dsputil_h264_template_mmx.c @@ -25,8 +25,8 @@ */ static void H264_CHROMA_MC8_TMPL(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y) { - uint64_t AA __align8; - uint64_t DD __align8; + DECLARE_ALIGNED_8(uint64_t, AA); + DECLARE_ALIGNED_8(uint64_t, DD); int i; if(y==0 && x==0) { @@ -242,8 +242,8 @@ static void H264_CHROMA_MC8_TMPL(uint8_t *dst/*align 8*/, uint8_t *src/*align 1* static void H264_CHROMA_MC4_TMPL(uint8_t *dst/*align 8*/, uint8_t *src/*align 1*/, int stride, int h, int x, int y) { - uint64_t AA __align8; - uint64_t DD __align8; + DECLARE_ALIGNED_8(uint64_t, AA); + DECLARE_ALIGNED_8(uint64_t, DD); int i; /* no special case for mv=(0,0) in 4x*, since it's much less common than in 8x*. diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c index 830c1fcf88..7d69859a67 100644 --- a/libavcodec/i386/dsputil_mmx.c +++ b/libavcodec/i386/dsputil_mmx.c @@ -303,7 +303,7 @@ void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size :"memory"); } -static const unsigned char __align8 vector128[8] = +static DECLARE_ALIGNED_8(const unsigned char, vector128[8]) = { 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 }; void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size) @@ -1546,7 +1546,7 @@ static void sub_hfyu_median_prediction_mmx2(uint8_t *dst, uint8_t *src1, uint8_t "movq "#d", "#o"+48(%1) \n\t"\ static int hadamard8_diff_mmx(void *s, uint8_t *src1, uint8_t *src2, int stride, int h){ - uint64_t temp[16] __align8; + DECLARE_ALIGNED_8(uint64_t, temp[16]); int sum=0; assert(h==8); @@ -1633,7 +1633,7 @@ static int hadamard8_diff_mmx(void *s, uint8_t *src1, uint8_t *src2, int stride, } static int hadamard8_diff_mmx2(void *s, uint8_t *src1, uint8_t *src2, int stride, int h){ - uint64_t temp[16] __align8; + DECLARE_ALIGNED_8(uint64_t, temp[16]); int sum=0; assert(h==8); diff --git a/libavcodec/i386/mpegvideo_mmx_template.c b/libavcodec/i386/mpegvideo_mmx_template.c index 48dc1bc689..2c50df232d 100644 --- a/libavcodec/i386/mpegvideo_mmx_template.c +++ b/libavcodec/i386/mpegvideo_mmx_template.c @@ -51,7 +51,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s, long last_non_zero_p1; int level=0, q; //=0 is cuz gcc says uninitalized ... const uint16_t *qmat, *bias; - __align8 int16_t temp_block[64]; + DECLARE_ALIGNED_8(int16_t, temp_block[64]); assert((7&(int)(&temp_block[0])) == 0); //did gcc align it correctly? diff --git a/libavcodec/i386/vp3dsp_sse2.c b/libavcodec/i386/vp3dsp_sse2.c index 4897ad8958..cf822f7d48 100644 --- a/libavcodec/i386/vp3dsp_sse2.c +++ b/libavcodec/i386/vp3dsp_sse2.c @@ -24,7 +24,7 @@ #include "../dsputil.h" #include "mmx.h" -static const unsigned short __align16 SSE2_dequant_const[] = +static DECLARE_ALIGNED_16(const unsigned short, SSE2_dequant_const[]) = { 0,65535,65535,0,0,0,0,0, // 0x0000 0000 0000 0000 0000 FFFF FFFF 0000 0,0,0,0,65535,65535,0,0, // 0x0000 0000 FFFF FFFF 0000 0000 0000 0000 @@ -35,7 +35,7 @@ static const unsigned short __align16 SSE2_dequant_const[] = 0,0,65535,65535, 0,0,0,0 // 0x0000 0000 0000 0000 FFFF FFFF 0000 0000 }; -static const unsigned int __align16 eight_data[] = +static DECLARE_ALIGNED_16(const unsigned int, eight_data[]) = { 0x00080008, 0x00080008, @@ -43,7 +43,7 @@ static const unsigned int __align16 eight_data[] = 0x00080008 }; -static const unsigned short __align16 SSE2_idct_data[7 * 8] = +static DECLARE_ALIGNED_16(const unsigned short, SSE2_idct_data[7 * 8]) = { 64277,64277,64277,64277,64277,64277,64277,64277, 60547,60547,60547,60547,60547,60547,60547,60547, diff --git a/libavcodec/imgresample.c b/libavcodec/imgresample.c index 86bce5d25f..906fde3f2e 100644 --- a/libavcodec/imgresample.c +++ b/libavcodec/imgresample.c @@ -50,8 +50,8 @@ struct ImgReSampleContext { int padtop, padbottom, padleft, padright; int pad_owidth, pad_oheight; int h_incr, v_incr; - int16_t h_filters[NB_PHASES][NB_TAPS] __align8; /* horizontal filters */ - int16_t v_filters[NB_PHASES][NB_TAPS] __align8; /* vertical filters */ + DECLARE_ALIGNED_8(int16_t, h_filters[NB_PHASES][NB_TAPS]); /* horizontal filters */ + DECLARE_ALIGNED_8(int16_t, v_filters[NB_PHASES][NB_TAPS]); /* vertical filters */ uint8_t *line_buf; }; diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 4a346ef609..79caa24c19 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -45,9 +45,9 @@ typedef struct MDECContext{ int mb_width; int mb_height; int mb_x, mb_y; - DCTELEM __align8 block[6][64]; - uint16_t __align8 intra_matrix[64]; - int __align8 q_intra_matrix[64]; + DECLARE_ALIGNED_8(DCTELEM, block[6][64]); + DECLARE_ALIGNED_8(uint16_t, intra_matrix[64]); + DECLARE_ALIGNED_8(int, q_intra_matrix[64]); uint8_t *bitstream_buffer; unsigned int bitstream_buffer_size; int block_last_index[6]; diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index 15c63f4ca8..951a622ee1 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -873,7 +873,7 @@ typedef struct MJpegDecodeContext { AVFrame picture; /* picture structure */ int linesize[MAX_COMPONENTS]; ///< linesize << interlaced int8_t *qscale_table; - DCTELEM block[64] __align8; + DECLARE_ALIGNED_8(DCTELEM, block[64]); ScanTable scantable; void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/); diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index a4e56dc23f..ba641f30a3 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -5963,7 +5963,7 @@ static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise? DCTELEM *block, int16_t *weight, DCTELEM *orig, int n, int qscale){ int16_t rem[64]; - DCTELEM d1[64] __align16; + DECLARE_ALIGNED_16(DCTELEM, d1[64]); const int *qmat; const uint8_t *scantable= s->intra_scantable.scantable; const uint8_t *perm_scantable= s->intra_scantable.permutated; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 14631d4d44..888b0b6086 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -134,7 +134,7 @@ typedef struct ScanTable{ uint8_t raster_end[64]; #ifdef ARCH_POWERPC /** Used by dct_quantise_alitvec to find last-non-zero */ - uint8_t __align8 inverse[64]; + DECLARE_ALIGNED_8(uint8_t, inverse[64]); #endif } ScanTable; @@ -494,7 +494,7 @@ typedef struct MpegEncContext { uint16_t (*q_inter_matrix16)[2][64]; int block_last_index[12]; ///< last non zero coefficient in block /* scantables */ - ScanTable __align8 intra_scantable; + DECLARE_ALIGNED_8(ScanTable, intra_scantable); ScanTable intra_h_scantable; ScanTable intra_v_scantable; ScanTable inter_scantable; ///< if inter == intra then intra should be used to reduce tha cache usage diff --git a/libavcodec/ppc/dsputil_h264_altivec.c b/libavcodec/ppc/dsputil_h264_altivec.c index 5f19631fe8..b9fef005ec 100644 --- a/libavcodec/ppc/dsputil_h264_altivec.c +++ b/libavcodec/ppc/dsputil_h264_altivec.c @@ -71,7 +71,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc00_ ## CODETYPE (uint8_t *dst, uin }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc10_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){ \ - uint64_t temp[SIZE*SIZE/8] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*SIZE/8]);\ uint8_t * const half= (uint8_t*)temp;\ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(half, src, SIZE, stride);\ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src, half, stride, stride, SIZE);\ @@ -82,14 +82,14 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc20_ ## CODETYPE(uint8_t *dst, uint }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc30_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*SIZE/8] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*SIZE/8]);\ uint8_t * const half= (uint8_t*)temp;\ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(half, src, SIZE, stride);\ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src+1, half, stride, stride, SIZE);\ }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc01_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*SIZE/8] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*SIZE/8]);\ uint8_t * const half= (uint8_t*)temp;\ put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(half, src, SIZE, stride);\ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src, half, stride, stride, SIZE);\ @@ -100,14 +100,14 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc02_ ## CODETYPE(uint8_t *dst, uint }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc03_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*SIZE/8] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*SIZE/8]);\ uint8_t * const half= (uint8_t*)temp;\ put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(half, src, SIZE, stride);\ OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src+stride, half, stride, stride, SIZE);\ }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc11_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*SIZE/4] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*SIZE/4]);\ uint8_t * const halfH= (uint8_t*)temp;\ uint8_t * const halfV= ((uint8_t*)temp) + SIZE*SIZE;\ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src, SIZE, stride);\ @@ -116,7 +116,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc11_ ## CODETYPE(uint8_t *dst, uint }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc31_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*SIZE/4] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*SIZE/4]);\ uint8_t * const halfH= (uint8_t*)temp;\ uint8_t * const halfV= ((uint8_t*)temp) + SIZE*SIZE;\ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src, SIZE, stride);\ @@ -125,7 +125,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc31_ ## CODETYPE(uint8_t *dst, uint }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc13_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*SIZE/4] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*SIZE/4]);\ uint8_t * const halfH= (uint8_t*)temp;\ uint8_t * const halfV= ((uint8_t*)temp) + SIZE*SIZE;\ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src + stride, SIZE, stride);\ @@ -134,7 +134,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc13_ ## CODETYPE(uint8_t *dst, uint }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc33_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*SIZE/4] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*SIZE/4]);\ uint8_t * const halfH= (uint8_t*)temp;\ uint8_t * const halfV= ((uint8_t*)temp) + SIZE*SIZE;\ put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src + stride, SIZE, stride);\ @@ -143,13 +143,13 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc33_ ## CODETYPE(uint8_t *dst, uint }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc22_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*(SIZE+8)/4] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*(SIZE+8)/4]);\ int16_t * const tmp= (int16_t*)temp;\ OPNAME ## h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(dst, tmp, src, stride, SIZE, stride);\ }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc21_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*(SIZE+8)/4 + SIZE*SIZE/4] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*(SIZE+8)/4 + SIZE*SIZE/4]);\ uint8_t * const halfH= (uint8_t*)temp;\ uint8_t * const halfHV= ((uint8_t*)temp) + SIZE*SIZE;\ int16_t * const tmp= ((int16_t*)temp) + SIZE*SIZE;\ @@ -159,7 +159,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc21_ ## CODETYPE(uint8_t *dst, uint }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc23_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*(SIZE+8)/4 + SIZE*SIZE/4] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*(SIZE+8)/4 + SIZE*SIZE/4]);\ uint8_t * const halfH= (uint8_t*)temp;\ uint8_t * const halfHV= ((uint8_t*)temp) + SIZE*SIZE;\ int16_t * const tmp= ((int16_t*)temp) + SIZE*SIZE;\ @@ -169,7 +169,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc23_ ## CODETYPE(uint8_t *dst, uint }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc12_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*(SIZE+8)/4 + SIZE*SIZE/4] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*(SIZE+8)/4 + SIZE*SIZE/4]);\ uint8_t * const halfV= (uint8_t*)temp;\ uint8_t * const halfHV= ((uint8_t*)temp) + SIZE*SIZE;\ int16_t * const tmp= ((int16_t*)temp) + SIZE*SIZE;\ @@ -179,7 +179,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc12_ ## CODETYPE(uint8_t *dst, uint }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc32_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){\ - uint64_t temp[SIZE*(SIZE+8)/4 + SIZE*SIZE/4] __align16;\ + DECLARE_ALIGNED_16(uint64_t, temp[SIZE*(SIZE+8)/4 + SIZE*SIZE/4]);\ uint8_t * const halfV= (uint8_t*)temp;\ uint8_t * const halfHV= ((uint8_t*)temp) + SIZE*SIZE;\ int16_t * const tmp= ((int16_t*)temp) + SIZE*SIZE;\ diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index e12afc76ae..a7a9e8bacd 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -285,9 +285,9 @@ typedef struct Vp3DecodeContext { /* these arrays need to be on 16-byte boundaries since SSE2 operations * index into them */ - int16_t __align16 intra_y_dequant[64]; - int16_t __align16 intra_c_dequant[64]; - int16_t __align16 inter_dequant[64]; + DECLARE_ALIGNED_16(int16_t, intra_y_dequant[64]); + DECLARE_ALIGNED_16(int16_t, intra_c_dequant[64]); + DECLARE_ALIGNED_16(int16_t, inter_dequant[64]); /* This table contains superblock_count * 16 entries. Each set of 16 * numbers corresponds to the fragment indices 0..15 of the superblock. @@ -1711,7 +1711,7 @@ static void render_slice(Vp3DecodeContext *s, int slice) int m, n; int i; /* indicates current fragment */ int16_t *dequantizer; - DCTELEM __align16 block[64]; + DECLARE_ALIGNED_16(DCTELEM, block[64]); unsigned char *output_plane; unsigned char *last_plane; unsigned char *golden_plane; diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 8017b32421..c557a2a7a5 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -102,15 +102,15 @@ typedef struct WMADecodeContext { int block_pos; /* current position in frame */ uint8_t ms_stereo; /* true if mid/side stereo mode */ uint8_t channel_coded[MAX_CHANNELS]; /* true if channel is coded */ - float exponents[MAX_CHANNELS][BLOCK_MAX_SIZE] __attribute__((aligned(16))); + DECLARE_ALIGNED_16(float, exponents[MAX_CHANNELS][BLOCK_MAX_SIZE]); float max_exponent[MAX_CHANNELS]; int16_t coefs1[MAX_CHANNELS][BLOCK_MAX_SIZE]; - float coefs[MAX_CHANNELS][BLOCK_MAX_SIZE] __attribute__((aligned(16))); + DECLARE_ALIGNED_16(float, coefs[MAX_CHANNELS][BLOCK_MAX_SIZE]); MDCTContext mdct_ctx[BLOCK_NB_SIZES]; float *windows[BLOCK_NB_SIZES]; - FFTSample mdct_tmp[BLOCK_MAX_SIZE] __attribute__((aligned(16))); /* temporary storage for imdct */ + DECLARE_ALIGNED_16(FFTSample, mdct_tmp[BLOCK_MAX_SIZE]); /* temporary storage for imdct */ /* output buffer for one frame and the last for IMDCT windowing */ - float frame_out[MAX_CHANNELS][BLOCK_MAX_SIZE * 2] __attribute__((aligned(16))); + DECLARE_ALIGNED_16(float, frame_out[MAX_CHANNELS][BLOCK_MAX_SIZE * 2]); /* last frame info */ uint8_t last_superframe[MAX_CODED_SUPERFRAME_SIZE + 4]; /* padding added */ int last_bitoffset; @@ -1097,7 +1097,7 @@ static int wma_decode_block(WMADecodeContext *s) for(ch = 0; ch < s->nb_channels; ch++) { if (s->channel_coded[ch]) { - FFTSample output[BLOCK_MAX_SIZE * 2] __attribute__((aligned(16))); + DECLARE_ALIGNED_16(FFTSample, output[BLOCK_MAX_SIZE * 2]); float *ptr; int i, n4, index, n; diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 93a7f2f8ce..dd88b7d286 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -49,7 +49,7 @@ typedef struct Wmv2Context{ int hshift; ScanTable abt_scantable[2]; - DCTELEM abt_block2[6][64] __align8; + DECLARE_ALIGNED_8(DCTELEM, abt_block2[6][64]); }Wmv2Context; static void wmv2_common_init(Wmv2Context * w){ -- cgit v1.2.3