diff options
Diffstat (limited to 'third_party/aom/test/av1_inv_txfm1d_test.cc')
| -rw-r--r-- | third_party/aom/test/av1_inv_txfm1d_test.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/third_party/aom/test/av1_inv_txfm1d_test.cc b/third_party/aom/test/av1_inv_txfm1d_test.cc index 9cf33a2fd..b871105eb 100644 --- a/third_party/aom/test/av1_inv_txfm1d_test.cc +++ b/third_party/aom/test/av1_inv_txfm1d_test.cc @@ -10,6 +10,7 @@ */ #include "test/av1_txfm_test.h" +#include "test/util.h" #include "av1/common/av1_fwd_txfm1d.h" #include "av1/common/av1_inv_txfm1d.h" @@ -41,14 +42,12 @@ const TxfmFunc inv_txfm_func_ls[][2] = { }; // the maximum stage number of fwd/inv 1d dct/adst txfm is 12 -const int8_t cos_bit[12] = { 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14 }; +const int8_t cos_bit[12] = { 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13 }; const int8_t range_bit[12] = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32 }; -#define ARRAY_SIZE(x) (int)(sizeof(x) / sizeof(x[0])) - TEST(av1_inv_txfm1d, round_trip) { ACMRandom rnd(ACMRandom::DeterministicSeed()); - for (int si = 0; si < ARRAY_SIZE(fwd_txfm_func_ls); ++si) { + for (int si = 0; si < NELEMENTS(fwd_txfm_func_ls); ++si) { int txfm_size = txfm_size_ls[si]; for (int ti = 0; ti < txfm_type_num; ++ti) { @@ -64,7 +63,7 @@ TEST(av1_inv_txfm1d, round_trip) { int32_t output[64]; int32_t round_trip_output[64]; - assert(txfm_size <= ARRAY_SIZE(input)); + ASSERT_LE(txfm_size, NELEMENTS(input)); for (int ni = 0; ni < txfm_size; ++ni) { input[ni] = rnd.Rand16() % input_base - rnd.Rand16() % input_base; |