checkasm: Use LOCAL_ALIGNED
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 24 Jul 2015 21:46:21 +0000 (23:46 +0200)
committerMartin Storsjö <martin@martin.st>
Sun, 26 Jul 2015 07:36:22 +0000 (10:36 +0300)
Fixes alignment issues and bus errors.

Signed-off-by: Martin Storsjö <martin@martin.st>
tests/checkasm/bswapdsp.c
tests/checkasm/h264pred.c
tests/checkasm/h264qpel.c

index 3871029..748a886 100644 (file)
@@ -22,6 +22,7 @@
 #include "checkasm.h"
 #include "libavcodec/bswapdsp.h"
 #include "libavutil/common.h"
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 
 #define BUF_SIZE 512
 
 void checkasm_check_bswapdsp(void)
 {
-    DECLARE_ALIGNED(16, uint8_t, src0)[BUF_SIZE];
-    DECLARE_ALIGNED(16, uint8_t, src1)[BUF_SIZE];
-    DECLARE_ALIGNED(16, uint8_t, dst0)[BUF_SIZE];
-    DECLARE_ALIGNED(16, uint8_t, dst1)[BUF_SIZE];
+    LOCAL_ALIGNED_16(uint8_t, src0, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, src1, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, dst0, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, dst1, [BUF_SIZE]);
     BswapDSPContext h;
 
     ff_bswapdsp_init(&h);
index 40e949a..08f23e6 100644 (file)
@@ -23,6 +23,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/h264pred.h"
 #include "libavutil/common.h"
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 
 static const int codec_ids[4] = { AV_CODEC_ID_H264, AV_CODEC_ID_VP8, AV_CODEC_ID_RV40, AV_CODEC_ID_SVQ3 };
@@ -232,8 +233,8 @@ void checkasm_check_h264pred(void)
         { check_pred8x8l,  "pred8x8l"  },
     };
 
-    DECLARE_ALIGNED(16, uint8_t, buf0)[BUF_SIZE];
-    DECLARE_ALIGNED(16, uint8_t, buf1)[BUF_SIZE];
+    LOCAL_ALIGNED_16(uint8_t, buf0, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, buf1, [BUF_SIZE]);
     H264PredContext h;
     int test, codec, chroma_format, bit_depth;
 
index 01b97ae..a67bbb4 100644 (file)
@@ -22,6 +22,7 @@
 #include "checkasm.h"
 #include "libavcodec/h264qpel.h"
 #include "libavutil/common.h"
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 
 static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
@@ -48,10 +49,10 @@ static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
 
 void checkasm_check_h264qpel(void)
 {
-    DECLARE_ALIGNED(16, uint8_t, buf0)[BUF_SIZE];
-    DECLARE_ALIGNED(16, uint8_t, buf1)[BUF_SIZE];
-    DECLARE_ALIGNED(16, uint8_t, dst0)[BUF_SIZE];
-    DECLARE_ALIGNED(16, uint8_t, dst1)[BUF_SIZE];
+    LOCAL_ALIGNED_16(uint8_t, buf0, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, buf1, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, dst0, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, dst1, [BUF_SIZE]);
     H264QpelContext h;
     int op, bit_depth, i, j;