shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix aligned memory allocation in unit tests"

--- a/test/fdct4x4_test.cc

+++ b/test/fdct4x4_test.cc

@@ -20,6 +20,7 @@

 #include "acm_random.h"

 #include "vpx/vpx_integer.h"

+#include "vpx_ports/mem.h"

 using libvpx_test::ACMRandom;

@@ -77,8 +78,8 @@

 TEST_P(FwdTrans4x4Test, SignBiasCheck) {

   ACMRandom rnd(ACMRandom::DeterministicSeed());

-  int16_t test_input_block[16];

-  int16_t test_output_block[16];

+  DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 16);

+  DECLARE_ALIGNED_ARRAY(16, int16_t, test_output_block, 16);

   const int pitch = 8;

   int count_sign_block[16][2];

   const int count_test_block = 1000000;

@@ -140,9 +141,10 @@

   double total_error = 0;

   const int count_test_block = 1000000;

   for (int i = 0; i < count_test_block; ++i) {

-    int16_t test_input_block[16];

-    int16_t test_temp_block[16];

-    uint8_t dst[16], src[16];

+    DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 16);

+    DECLARE_ALIGNED_ARRAY(16, int16_t, test_temp_block, 16);

+    DECLARE_ALIGNED_ARRAY(16, uint8_t, dst, 16);

+    DECLARE_ALIGNED_ARRAY(16, uint8_t, src, 16);

     for (int j = 0; j < 16; ++j) {

       src[j] = rnd.Rand8();

--- a/test/fdct8x8_test.cc

+++ b/test/fdct8x8_test.cc

@@ -13,6 +13,7 @@

 #include <string.h>

 #include "third_party/googletest/src/include/gtest/gtest.h"

+#include "vpx_ports/mem.h"

 extern "C" {

 #include "vp9_rtcd.h"

@@ -81,8 +82,8 @@

 TEST_P(FwdTrans8x8Test, SignBiasCheck) {

   ACMRandom rnd(ACMRandom::DeterministicSeed());

-  int16_t test_input_block[64];

-  int16_t test_output_block[64];

+  DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 64);

+  DECLARE_ALIGNED_ARRAY(16, int16_t, test_output_block, 64);

   const int pitch = 16;

   int count_sign_block[64][2];

   const int count_test_block = 100000;

@@ -152,9 +153,10 @@

   double total_error = 0;

   const int count_test_block = 100000;

   for (int i = 0; i < count_test_block; ++i) {

-    int16_t test_input_block[64];

-    int16_t test_temp_block[64];

-    uint8_t dst[64], src[64];

+    DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 64);

+    DECLARE_ALIGNED_ARRAY(16, int16_t, test_temp_block, 64);

+    DECLARE_ALIGNED_ARRAY(16, uint8_t, dst, 64);

+    DECLARE_ALIGNED_ARRAY(16, uint8_t, src, 64);

     for (int j = 0; j < 64; ++j) {

       src[j] = rnd.Rand8();

@@ -202,9 +204,10 @@

   double total_error = 0;

   const int count_test_block = 100000;

   for (int i = 0; i < count_test_block; ++i) {

-    int16_t test_input_block[64];

-    int16_t test_temp_block[64];

-    uint8_t dst[64], src[64];

+    DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 64);

+    DECLARE_ALIGNED_ARRAY(16, int16_t, test_temp_block, 64);

+    DECLARE_ALIGNED_ARRAY(16, uint8_t, dst, 64);

+    DECLARE_ALIGNED_ARRAY(16, uint8_t, src, 64);

     for (int j = 0; j < 64; ++j) {

       src[j] = rnd.Rand8() % 2 ? 255 : 0;