diff options
Diffstat (limited to 'test/partial_idct_test.cc')
-rw-r--r-- | test/partial_idct_test.cc | 148 |
1 files changed, 81 insertions, 67 deletions
diff --git a/test/partial_idct_test.cc b/test/partial_idct_test.cc index 9eb4d9dbb..0c704c5c8 100644 --- a/test/partial_idct_test.cc +++ b/test/partial_idct_test.cc @@ -41,13 +41,42 @@ class PartialIDctTest : public ::testing::TestWithParam<PartialInvTxfmParam> { partial_itxfm_ = GET_PARAM(2); tx_size_ = GET_PARAM(3); last_nonzero_ = GET_PARAM(4); + + switch (tx_size_) { + case TX_4X4: size_ = 4; break; + case TX_8X8: size_ = 8; break; + case TX_16X16: size_ = 16; break; + case TX_32X32: size_ = 32; break; + default: FAIL() << "Wrong Size!"; break; + } + block_size_ = size_ * size_; + + input_block_ = reinterpret_cast<tran_low_t *>( + vpx_memalign(16, sizeof(*input_block_) * block_size_)); + output_block_ = reinterpret_cast<uint8_t *>( + vpx_memalign(16, sizeof(*output_block_) * block_size_)); + output_block_ref_ = reinterpret_cast<uint8_t *>( + vpx_memalign(16, sizeof(*output_block_ref_) * block_size_)); } - virtual void TearDown() { libvpx_test::ClearSystemState(); } + virtual void TearDown() { + vpx_free(input_block_); + input_block_ = NULL; + vpx_free(output_block_); + output_block_ = NULL; + vpx_free(output_block_ref_); + output_block_ref_ = NULL; + libvpx_test::ClearSystemState(); + } protected: int last_nonzero_; TX_SIZE tx_size_; + tran_low_t *input_block_; + uint8_t *output_block_; + uint8_t *output_block_ref_; + int size_; + int block_size_; FwdTxfmFunc ftxfm_; InvTxfmFunc full_itxfm_; InvTxfmFunc partial_itxfm_; @@ -55,95 +84,62 @@ class PartialIDctTest : public ::testing::TestWithParam<PartialInvTxfmParam> { TEST_P(PartialIDctTest, RunQuantCheck) { ACMRandom rnd(ACMRandom::DeterministicSeed()); - int size; - switch (tx_size_) { - case TX_4X4: size = 4; break; - case TX_8X8: size = 8; break; - case TX_16X16: size = 16; break; - case TX_32X32: size = 32; break; - default: FAIL() << "Wrong Size!"; break; - } - DECLARE_ALIGNED(16, tran_low_t, test_coef_block1[kMaxNumCoeffs]); - DECLARE_ALIGNED(16, tran_low_t, test_coef_block2[kMaxNumCoeffs]); - DECLARE_ALIGNED(16, uint8_t, dst1[kMaxNumCoeffs]); - DECLARE_ALIGNED(16, uint8_t, dst2[kMaxNumCoeffs]); const int count_test_block = 1000; - const int block_size = size * size; DECLARE_ALIGNED(16, int16_t, input_extreme_block[kMaxNumCoeffs]); DECLARE_ALIGNED(16, tran_low_t, output_ref_block[kMaxNumCoeffs]); - int max_error = 0; for (int i = 0; i < count_test_block; ++i) { // clear out destination buffer - memset(dst1, 0, sizeof(*dst1) * block_size); - memset(dst2, 0, sizeof(*dst2) * block_size); - memset(test_coef_block1, 0, sizeof(*test_coef_block1) * block_size); - memset(test_coef_block2, 0, sizeof(*test_coef_block2) * block_size); + memset(input_block_, 0, sizeof(*input_block_) * block_size_); + memset(output_block_, 0, sizeof(*output_block_) * block_size_); + memset(output_block_ref_, 0, sizeof(*output_block_ref_) * block_size_); ACMRandom rnd(ACMRandom::DeterministicSeed()); for (int i = 0; i < count_test_block; ++i) { // Initialize a test block with input range [-255, 255]. if (i == 0) { - for (int j = 0; j < block_size; ++j) input_extreme_block[j] = 255; + for (int j = 0; j < block_size_; ++j) input_extreme_block[j] = 255; } else if (i == 1) { - for (int j = 0; j < block_size; ++j) input_extreme_block[j] = -255; + for (int j = 0; j < block_size_; ++j) input_extreme_block[j] = -255; } else { - for (int j = 0; j < block_size; ++j) { + for (int j = 0; j < block_size_; ++j) { input_extreme_block[j] = rnd.Rand8() % 2 ? 255 : -255; } } - ftxfm_(input_extreme_block, output_ref_block, size); + ftxfm_(input_extreme_block, output_ref_block, size_); // quantization with maximum allowed step sizes - test_coef_block1[0] = (output_ref_block[0] / 1336) * 1336; + input_block_[0] = (output_ref_block[0] / 1336) * 1336; for (int j = 1; j < last_nonzero_; ++j) { - test_coef_block1[vp9_default_scan_orders[tx_size_].scan[j]] = + input_block_[vp9_default_scan_orders[tx_size_].scan[j]] = (output_ref_block[j] / 1828) * 1828; } } - ASM_REGISTER_STATE_CHECK(full_itxfm_(test_coef_block1, dst1, size)); - ASM_REGISTER_STATE_CHECK(partial_itxfm_(test_coef_block1, dst2, size)); + ASM_REGISTER_STATE_CHECK( + full_itxfm_(input_block_, output_block_ref_, size_)); + ASM_REGISTER_STATE_CHECK( + partial_itxfm_(input_block_, output_block_, size_)); - for (int j = 0; j < block_size; ++j) { - const int diff = dst1[j] - dst2[j]; - const int error = diff * diff; - if (max_error < error) max_error = error; - } + ASSERT_EQ(0, memcmp(output_block_ref_, output_block_, + sizeof(*output_block_) * block_size_)) + << "Error: partial inverse transform produces different results"; } - - EXPECT_EQ(0, max_error) - << "Error: partial inverse transform produces different results"; } TEST_P(PartialIDctTest, ResultsMatch) { ACMRandom rnd(ACMRandom::DeterministicSeed()); - int size; - switch (tx_size_) { - case TX_4X4: size = 4; break; - case TX_8X8: size = 8; break; - case TX_16X16: size = 16; break; - case TX_32X32: size = 32; break; - default: FAIL() << "Wrong Size!"; break; - } - DECLARE_ALIGNED(16, tran_low_t, test_coef_block1[kMaxNumCoeffs]); - DECLARE_ALIGNED(16, tran_low_t, test_coef_block2[kMaxNumCoeffs]); - DECLARE_ALIGNED(16, uint8_t, dst1[kMaxNumCoeffs]); - DECLARE_ALIGNED(16, uint8_t, dst2[kMaxNumCoeffs]); const int count_test_block = 1000; const int max_coeff = 32766 / 4; - const int block_size = size * size; - int max_error = 0; for (int i = 0; i < count_test_block; ++i) { // clear out destination buffer - memset(dst1, 0, sizeof(*dst1) * block_size); - memset(dst2, 0, sizeof(*dst2) * block_size); - memset(test_coef_block1, 0, sizeof(*test_coef_block1) * block_size); - memset(test_coef_block2, 0, sizeof(*test_coef_block2) * block_size); + memset(input_block_, 0, sizeof(*input_block_) * block_size_); + memset(output_block_, 0, sizeof(*output_block_) * block_size_); + memset(output_block_ref_, 0, sizeof(*output_block_ref_) * block_size_); int max_energy_leftover = max_coeff * max_coeff; for (int j = 0; j < last_nonzero_; ++j) { int16_t coef = static_cast<int16_t>(sqrt(1.0 * max_energy_leftover) * @@ -153,24 +149,42 @@ TEST_P(PartialIDctTest, ResultsMatch) { max_energy_leftover = 0; coef = 0; } - test_coef_block1[vp9_default_scan_orders[tx_size_].scan[j]] = coef; + input_block_[vp9_default_scan_orders[tx_size_].scan[j]] = coef; } - memcpy(test_coef_block2, test_coef_block1, - sizeof(*test_coef_block2) * block_size); + ASM_REGISTER_STATE_CHECK( + full_itxfm_(input_block_, output_block_ref_, size_)); + ASM_REGISTER_STATE_CHECK( + partial_itxfm_(input_block_, output_block_, size_)); - ASM_REGISTER_STATE_CHECK(full_itxfm_(test_coef_block1, dst1, size)); - ASM_REGISTER_STATE_CHECK(partial_itxfm_(test_coef_block2, dst2, size)); + ASSERT_EQ(0, memcmp(output_block_ref_, output_block_, + sizeof(*output_block_) * block_size_)) + << "Error: partial inverse transform produces different results"; + } +} - for (int j = 0; j < block_size; ++j) { - const int diff = dst1[j] - dst2[j]; - const int error = diff * diff; - if (max_error < error) max_error = error; +TEST_P(PartialIDctTest, AddOutputBlock) { + ACMRandom rnd(ACMRandom::DeterministicSeed()); + const int count_test_block = 10; + for (int i = 0; i < count_test_block; ++i) { + memset(input_block_, 0, sizeof(*input_block_) * block_size_); + for (int j = 0; j < last_nonzero_; ++j) { + input_block_[vp9_default_scan_orders[tx_size_].scan[j]] = 10; } - } - EXPECT_EQ(0, max_error) - << "Error: partial inverse transform produces different results"; + for (int j = 0; j < block_size_; ++j) { + output_block_[j] = output_block_ref_[j] = rnd.Rand8(); + } + + ASM_REGISTER_STATE_CHECK( + full_itxfm_(input_block_, output_block_ref_, size_)); + ASM_REGISTER_STATE_CHECK( + partial_itxfm_(input_block_, output_block_, size_)); + + ASSERT_EQ(0, memcmp(output_block_ref_, output_block_, + sizeof(*output_block_) * block_size_)) + << "Error: Transform results are not correctly added to output."; + } } using std::tr1::make_tuple; @@ -214,7 +228,7 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vpx_fdct4x4_c, &vpx_idct4x4_16_add_c, &vpx_idct4x4_1_add_neon, TX_4X4, 1))); #else // !CONFIG_VP9_HIGHBITDEPTH -// 32x32_34_ 32x32_135_ are implemented using the 1024 version. +// 32x32_135_ is implemented using the 1024 version. INSTANTIATE_TEST_CASE_P( NEON, PartialIDctTest, ::testing::Values(make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c, @@ -222,7 +236,7 @@ INSTANTIATE_TEST_CASE_P( make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c, &vpx_idct32x32_1024_add_neon, TX_32X32, 135), make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c, - &vpx_idct32x32_1024_add_neon, TX_32X32, 34), + &vpx_idct32x32_34_add_neon, TX_32X32, 34), make_tuple(&vpx_fdct32x32_c, &vpx_idct32x32_1024_add_c, &vpx_idct32x32_1_add_neon, TX_32X32, 1), make_tuple(&vpx_fdct16x16_c, &vpx_idct16x16_256_add_c, |