Increase alignment for DCT block arrays from 8 to 16
authorAlexander Strange <astrange@ithinksw.com>
Tue, 8 Apr 2008 01:09:33 +0000 (01:09 +0000)
committerRobert Swain <robert.swain@gmail.com>
Tue, 8 Apr 2008 01:09:33 +0000 (01:09 +0000)
Patch by Alexander Strange ( astrange ithinksw com )

Originally committed as revision 12767 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/asv1.c
libavcodec/dv.c
libavcodec/mdec.c
libavcodec/mjpegdec.h
libavcodec/wmv2.h

index f7d3f4c..ba8ca16 100644 (file)
@@ -47,7 +47,7 @@ typedef struct ASV1Context{
     int mb_height;
     int mb_width2;
     int mb_height2;
-    DECLARE_ALIGNED_8(DCTELEM, block[6][64]);
+    DECLARE_ALIGNED_16(DCTELEM, block[6][64]);
     DECLARE_ALIGNED_8(uint16_t, intra_matrix[64]);
     DECLARE_ALIGNED_8(int, q_intra_matrix[64]);
     uint8_t *bitstream_buffer;
index 3a8a843..3983381 100644 (file)
@@ -376,7 +376,7 @@ static inline void dv_decode_video_segment(DVVideoContext *s,
     PutBitContext pb, vs_pb;
     GetBitContext gb;
     BlockInfo mb_data[5 * 6], *mb, *mb1;
-    DECLARE_ALIGNED_8(DCTELEM, sblock[5*6][64]);
+    DECLARE_ALIGNED_16(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;
index 5c1382e..356e031 100644 (file)
@@ -47,7 +47,7 @@ typedef struct MDECContext{
     int mb_width;
     int mb_height;
     int mb_x, mb_y;
-    DECLARE_ALIGNED_8(DCTELEM, block[6][64]);
+    DECLARE_ALIGNED_16(DCTELEM, block[6][64]);
     DECLARE_ALIGNED_8(uint16_t, intra_matrix[64]);
     DECLARE_ALIGNED_8(int, q_intra_matrix[64]);
     uint8_t *bitstream_buffer;
index 6c1e40f..d6022eb 100644 (file)
@@ -82,7 +82,7 @@ typedef struct MJpegDecodeContext {
     AVFrame picture; /* picture structure */
     int linesize[MAX_COMPONENTS];                   ///< linesize << interlaced
     int8_t *qscale_table;
-    DECLARE_ALIGNED_8(DCTELEM, block[64]);
+    DECLARE_ALIGNED_16(DCTELEM, block[64]);
     ScanTable scantable;
     DSPContext dsp;
 
index 2fd842e..9d43ec5 100644 (file)
@@ -50,7 +50,7 @@ typedef struct Wmv2Context{
     int hshift;
 
     ScanTable abt_scantable[2];
-    DECLARE_ALIGNED_8(DCTELEM, abt_block2[6][64]);
+    DECLARE_ALIGNED_16(DCTELEM, abt_block2[6][64]);
 }Wmv2Context;
 
 void ff_wmv2_common_init(Wmv2Context * w);