replace DECLARE_ALIGNED_ARRAY w/DECLARE_ALIGNED
this macro was used inconsistently and only differs in behavior from
DECLARE_ALIGNED when an alignment attribute is unavailable. this macro
is used with calls to assembly, while generic c-code doesn't rely on it,
so in a c-only build without an alignment attribute the code will
function as expected.
Change-Id: Ie9d06d4028c0de17c63b3a27e6c1b0491cc4ea79
diff --git a/test/lpf_8_test.cc b/test/lpf_8_test.cc
index d60ed74..3d21e6c 100644
--- a/test/lpf_8_test.cc
+++ b/test/lpf_8_test.cc
@@ -182,11 +182,11 @@
const int count_test_block = number_of_iterations;
#if CONFIG_VP9_HIGHBITDEPTH
int32_t bd = bit_depth_;
- DECLARE_ALIGNED_ARRAY(16, uint16_t, s, kNumCoeffs);
- DECLARE_ALIGNED_ARRAY(16, uint16_t, ref_s, kNumCoeffs);
+ DECLARE_ALIGNED(16, uint16_t, s[kNumCoeffs]);
+ DECLARE_ALIGNED(16, uint16_t, ref_s[kNumCoeffs]);
#else
- DECLARE_ALIGNED_ARRAY(8, uint8_t, s, kNumCoeffs);
- DECLARE_ALIGNED_ARRAY(8, uint8_t, ref_s, kNumCoeffs);
+ DECLARE_ALIGNED(8, uint8_t, s[kNumCoeffs]);
+ DECLARE_ALIGNED(8, uint8_t, ref_s[kNumCoeffs]);
#endif // CONFIG_VP9_HIGHBITDEPTH
int err_count_total = 0;
int first_failure = -1;
@@ -267,11 +267,11 @@
const int count_test_block = number_of_iterations;
#if CONFIG_VP9_HIGHBITDEPTH
const int32_t bd = bit_depth_;
- DECLARE_ALIGNED_ARRAY(16, uint16_t, s, kNumCoeffs);
- DECLARE_ALIGNED_ARRAY(16, uint16_t, ref_s, kNumCoeffs);
+ DECLARE_ALIGNED(16, uint16_t, s[kNumCoeffs]);
+ DECLARE_ALIGNED(16, uint16_t, ref_s[kNumCoeffs]);
#else
- DECLARE_ALIGNED_ARRAY(8, uint8_t, s, kNumCoeffs);
- DECLARE_ALIGNED_ARRAY(8, uint8_t, ref_s, kNumCoeffs);
+ DECLARE_ALIGNED(8, uint8_t, s[kNumCoeffs]);
+ DECLARE_ALIGNED(8, uint8_t, ref_s[kNumCoeffs]);
#endif // CONFIG_VP9_HIGHBITDEPTH
int err_count_total = 0;
int first_failure = -1;
@@ -338,11 +338,11 @@
const int count_test_block = number_of_iterations;
#if CONFIG_VP9_HIGHBITDEPTH
const int32_t bd = bit_depth_;
- DECLARE_ALIGNED_ARRAY(16, uint16_t, s, kNumCoeffs);
- DECLARE_ALIGNED_ARRAY(16, uint16_t, ref_s, kNumCoeffs);
+ DECLARE_ALIGNED(16, uint16_t, s[kNumCoeffs]);
+ DECLARE_ALIGNED(16, uint16_t, ref_s[kNumCoeffs]);
#else
- DECLARE_ALIGNED_ARRAY(8, uint8_t, s, kNumCoeffs);
- DECLARE_ALIGNED_ARRAY(8, uint8_t, ref_s, kNumCoeffs);
+ DECLARE_ALIGNED(8, uint8_t, s[kNumCoeffs]);
+ DECLARE_ALIGNED(8, uint8_t, ref_s[kNumCoeffs]);
#endif // CONFIG_VP9_HIGHBITDEPTH
int err_count_total = 0;
int first_failure = -1;
@@ -440,11 +440,11 @@
ACMRandom rnd(ACMRandom::DeterministicSeed());
const int count_test_block = number_of_iterations;
#if CONFIG_VP9_HIGHBITDEPTH
- DECLARE_ALIGNED_ARRAY(16, uint16_t, s, kNumCoeffs);
- DECLARE_ALIGNED_ARRAY(16, uint16_t, ref_s, kNumCoeffs);
+ DECLARE_ALIGNED(16, uint16_t, s[kNumCoeffs]);
+ DECLARE_ALIGNED(16, uint16_t, ref_s[kNumCoeffs]);
#else
- DECLARE_ALIGNED_ARRAY(8, uint8_t, s, kNumCoeffs);
- DECLARE_ALIGNED_ARRAY(8, uint8_t, ref_s, kNumCoeffs);
+ DECLARE_ALIGNED(8, uint8_t, s[kNumCoeffs]);
+ DECLARE_ALIGNED(8, uint8_t, ref_s[kNumCoeffs]);
#endif // CONFIG_VP9_HIGHBITDEPTH
int err_count_total = 0;
int first_failure = -1;