generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean-up vp9_intrapred_test

Browse Source 
remove tuple and overkill VP9IntraPredBase class.

Change-Id: I85b85bdd33d7fe417895e75f77db219f713dfea3
This commit is contained in:
skal 2016-07-13 10:52:04 -07:00 committed by Pascal Massimino
parent fed14a3e94
commit ce050afaf3
1 changed files with 119 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

253
test/vp9_intrapred_test.cc
View File

@ -28,18 +28,41 @@ using libvpx_test::ACMRandom;
const int count_test_block = 100000; const int count_test_block = 100000;
// Base class for VP9 intra prediction tests. typedef void (*intra_pred_fn_t)(
class VP9IntraPredBase { uint16_t* dst, ptrdiff_t stride,
public: const uint16_t* above, const uint16_t* left, int bps);
virtual ~VP9IntraPredBase() { libvpx_test::ClearSystemState(); }
protected: struct IntraPredFunc {
virtual void Predict() = 0; IntraPredFunc(intra_pred_fn_t pred = NULL, intra_pred_fn_t ref = NULL,
int block_size_value = 0, int bit_depth_value = 0)
: pred_fn(pred), ref_fn(ref),
block_size(block_size_value), bit_depth(bit_depth_value) {}
intra_pred_fn_t pred_fn;
intra_pred_fn_t ref_fn;
int block_size;
int bit_depth;
};
class VP9IntraPredTest : public ::testing::TestWithParam<IntraPredFunc> {
virtual void SetUp() {
params_ = GetParam();
stride_ = params_.block_size * 3;
mask_ = (1 << params_.bit_depth) - 1;
}
void Predict() {
const int bit_depth = params_.bit_depth;
params_.ref_fn(ref_dst_, stride_, above_row_, left_col_, bit_depth);
ASM_REGISTER_STATE_CHECK(params_.pred_fn(dst_, stride_,
above_row_, left_col_, bit_depth));
}
void CheckPrediction(int test_case_number, int *error_count) const { void CheckPrediction(int test_case_number, int *error_count) const {
// For each pixel ensure that the calculated value is the same as reference. // For each pixel ensure that the calculated value is the same as reference.
for (int y = 0; y < block_size_; y++) { const int block_size = params_.block_size;
for (int x = 0; x < block_size_; x++) { for (int y = 0; y < block_size; y++) {
for (int x = 0; x < block_size; x++) {
*error_count += ref_dst_[x + y * stride_] != dst_[x + y * stride_]; *error_count += ref_dst_[x + y * stride_] != dst_[x + y * stride_];
if (*error_count == 1) { if (*error_count == 1) {
ASSERT_EQ(ref_dst_[x + y * stride_], dst_[x + y * stride_]) ASSERT_EQ(ref_dst_[x + y * stride_], dst_[x + y * stride_])
@ -49,24 +72,26 @@ class VP9IntraPredBase {
} }
} }
public:
void RunTest(uint16_t* left_col, uint16_t* above_data, void RunTest(uint16_t* left_col, uint16_t* above_data,
uint16_t* dst, uint16_t* ref_dst) { uint16_t* dst, uint16_t* ref_dst) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
const int block_size = params_.block_size;
above_row_ = above_data + 16;
left_col_ = left_col; left_col_ = left_col;
dst_ = dst; dst_ = dst;
ref_dst_ = ref_dst; ref_dst_ = ref_dst;
above_row_ = above_data + 16;
int error_count = 0; int error_count = 0;
for (int i = 0; i < count_test_block; ++i) { for (int i = 0; i < count_test_block; ++i) {
// Fill edges with random data, try first with saturated values. // Fill edges with random data, try first with saturated values.
for (int x = -1; x <= block_size_*2; x++) { for (int x = -1; x <= block_size * 2; x++) {
if (i == 0) { if (i == 0) {
above_row_[x] = mask_; above_row_[x] = mask_;
} else { } else {
above_row_[x] = rnd.Rand16() & mask_; above_row_[x] = rnd.Rand16() & mask_;
} }
} }
for (int y = 0; y < block_size_; y++) { for (int y = 0; y < block_size; y++) {
if (i == 0) { if (i == 0) {
left_col_[y] = mask_; left_col_[y] = mask_;
} else { } else {
@ -79,43 +104,14 @@ class VP9IntraPredBase {
ASSERT_EQ(0, error_count); ASSERT_EQ(0, error_count);
} }
int block_size_; uint16_t* above_row_;
uint16_t *above_row_; uint16_t* left_col_;
uint16_t *left_col_; uint16_t* dst_;
uint16_t *dst_; uint16_t* ref_dst_;
uint16_t *ref_dst_;
ptrdiff_t stride_; ptrdiff_t stride_;
int mask_; int mask_;
};
typedef void (*intra_pred_fn_t)( IntraPredFunc params_;
uint16_t *dst, ptrdiff_t stride, const uint16_t *above,
const uint16_t *left, int bps);
typedef std::tr1::tuple<intra_pred_fn_t,
intra_pred_fn_t, int, int> intra_pred_params_t;
class VP9IntraPredTest
: public VP9IntraPredBase,
public ::testing::TestWithParam<intra_pred_params_t> {
virtual void SetUp() {
pred_fn_ = GET_PARAM(0);
ref_fn_ = GET_PARAM(1);
block_size_ = GET_PARAM(2);
bit_depth_ = GET_PARAM(3);
stride_ = block_size_ * 3;
mask_ = (1 << bit_depth_) - 1;
}
virtual void Predict() {
const uint16_t *const_above_row = above_row_;
const uint16_t *const_left_col = left_col_;
ref_fn_(ref_dst_, stride_, const_above_row, const_left_col, bit_depth_);
ASM_REGISTER_STATE_CHECK(pred_fn_(dst_, stride_, const_above_row,
const_left_col, bit_depth_));
}
intra_pred_fn_t pred_fn_;
intra_pred_fn_t ref_fn_;
int bit_depth_;
}; };
TEST_P(VP9IntraPredTest, IntraPredTests) { TEST_P(VP9IntraPredTest, IntraPredTests) {
@ -127,102 +123,91 @@ TEST_P(VP9IntraPredTest, IntraPredTests) {
RunTest(left_col, above_data, dst, ref_dst); RunTest(left_col, above_data, dst, ref_dst);
} }
using std::tr1::make_tuple;
#if HAVE_SSE2 #if HAVE_SSE2
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest, INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest,
::testing::Values( ::testing::Values(
make_tuple(&vpx_highbd_dc_predictor_32x32_sse2, IntraPredFunc(&vpx_highbd_dc_predictor_32x32_sse2,
&vpx_highbd_dc_predictor_32x32_c, 32, 8), &vpx_highbd_dc_predictor_32x32_c, 32, 8),
make_tuple(&vpx_highbd_tm_predictor_16x16_sse2, IntraPredFunc(&vpx_highbd_tm_predictor_16x16_sse2,
&vpx_highbd_tm_predictor_16x16_c, 16, 8), &vpx_highbd_tm_predictor_16x16_c, 16, 8),
make_tuple(&vpx_highbd_tm_predictor_32x32_sse2, IntraPredFunc(&vpx_highbd_tm_predictor_32x32_sse2,
&vpx_highbd_tm_predictor_32x32_c, 32, 8), &vpx_highbd_tm_predictor_32x32_c, 32, 8),
make_tuple(&vpx_highbd_dc_predictor_4x4_sse2, IntraPredFunc(&vpx_highbd_dc_predictor_4x4_sse2,
&vpx_highbd_dc_predictor_4x4_c, 4, 8), &vpx_highbd_dc_predictor_4x4_c, 4, 8),
make_tuple(&vpx_highbd_dc_predictor_8x8_sse2, IntraPredFunc(&vpx_highbd_dc_predictor_8x8_sse2,
&vpx_highbd_dc_predictor_8x8_c, 8, 8), &vpx_highbd_dc_predictor_8x8_c, 8, 8),
make_tuple(&vpx_highbd_dc_predictor_16x16_sse2, IntraPredFunc(&vpx_highbd_dc_predictor_16x16_sse2,
&vpx_highbd_dc_predictor_16x16_c, 16, 8), &vpx_highbd_dc_predictor_16x16_c, 16, 8),
make_tuple(&vpx_highbd_v_predictor_4x4_sse2, IntraPredFunc(&vpx_highbd_v_predictor_4x4_sse2,
&vpx_highbd_v_predictor_4x4_c, 4, 8), &vpx_highbd_v_predictor_4x4_c, 4, 8),
make_tuple(&vpx_highbd_v_predictor_8x8_sse2, IntraPredFunc(&vpx_highbd_v_predictor_8x8_sse2,
&vpx_highbd_v_predictor_8x8_c, 8, 8), &vpx_highbd_v_predictor_8x8_c, 8, 8),
make_tuple(&vpx_highbd_v_predictor_16x16_sse2, IntraPredFunc(&vpx_highbd_v_predictor_16x16_sse2,
&vpx_highbd_v_predictor_16x16_c, 16, 8), &vpx_highbd_v_predictor_16x16_c, 16, 8),
make_tuple(&vpx_highbd_v_predictor_32x32_sse2, IntraPredFunc(&vpx_highbd_v_predictor_32x32_sse2,
&vpx_highbd_v_predictor_32x32_c, 32, 8), &vpx_highbd_v_predictor_32x32_c, 32, 8),
make_tuple(&vpx_highbd_tm_predictor_4x4_sse2, IntraPredFunc(&vpx_highbd_tm_predictor_4x4_sse2,
&vpx_highbd_tm_predictor_4x4_c, 4, 8), &vpx_highbd_tm_predictor_4x4_c, 4, 8),
make_tuple(&vpx_highbd_tm_predictor_8x8_sse2, IntraPredFunc(&vpx_highbd_tm_predictor_8x8_sse2,
&vpx_highbd_tm_predictor_8x8_c, 8, 8))); &vpx_highbd_tm_predictor_8x8_c, 8, 8)
));
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest, INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest,
::testing::Values( ::testing::Values(
make_tuple(&vpx_highbd_dc_predictor_32x32_sse2, IntraPredFunc(&vpx_highbd_dc_predictor_32x32_sse2,
&vpx_highbd_dc_predictor_32x32_c, 32, &vpx_highbd_dc_predictor_32x32_c, 32, 10),
10), IntraPredFunc(&vpx_highbd_tm_predictor_16x16_sse2,
make_tuple(&vpx_highbd_tm_predictor_16x16_sse2, &vpx_highbd_tm_predictor_16x16_c, 16, 10),
&vpx_highbd_tm_predictor_16x16_c, 16, IntraPredFunc(&vpx_highbd_tm_predictor_32x32_sse2,
10), &vpx_highbd_tm_predictor_32x32_c, 32, 10),
make_tuple(&vpx_highbd_tm_predictor_32x32_sse2, IntraPredFunc(&vpx_highbd_dc_predictor_4x4_sse2,
&vpx_highbd_tm_predictor_32x32_c, 32, &vpx_highbd_dc_predictor_4x4_c, 4, 10),
10), IntraPredFunc(&vpx_highbd_dc_predictor_8x8_sse2,
make_tuple(&vpx_highbd_dc_predictor_4x4_sse2, &vpx_highbd_dc_predictor_8x8_c, 8, 10),
&vpx_highbd_dc_predictor_4x4_c, 4, 10), IntraPredFunc(&vpx_highbd_dc_predictor_16x16_sse2,
make_tuple(&vpx_highbd_dc_predictor_8x8_sse2, &vpx_highbd_dc_predictor_16x16_c, 16, 10),
&vpx_highbd_dc_predictor_8x8_c, 8, 10), IntraPredFunc(&vpx_highbd_v_predictor_4x4_sse2,
make_tuple(&vpx_highbd_dc_predictor_16x16_sse2, &vpx_highbd_v_predictor_4x4_c, 4, 10),
&vpx_highbd_dc_predictor_16x16_c, 16, IntraPredFunc(&vpx_highbd_v_predictor_8x8_sse2,
10), &vpx_highbd_v_predictor_8x8_c, 8, 10),
make_tuple(&vpx_highbd_v_predictor_4x4_sse2, IntraPredFunc(&vpx_highbd_v_predictor_16x16_sse2,
&vpx_highbd_v_predictor_4x4_c, 4, 10), &vpx_highbd_v_predictor_16x16_c, 16, 10),
make_tuple(&vpx_highbd_v_predictor_8x8_sse2, IntraPredFunc(&vpx_highbd_v_predictor_32x32_sse2,
&vpx_highbd_v_predictor_8x8_c, 8, 10), &vpx_highbd_v_predictor_32x32_c, 32, 10),
make_tuple(&vpx_highbd_v_predictor_16x16_sse2, IntraPredFunc(&vpx_highbd_tm_predictor_4x4_sse2,
&vpx_highbd_v_predictor_16x16_c, 16, &vpx_highbd_tm_predictor_4x4_c, 4, 10),
10), IntraPredFunc(&vpx_highbd_tm_predictor_8x8_sse2,
make_tuple(&vpx_highbd_v_predictor_32x32_sse2, &vpx_highbd_tm_predictor_8x8_c, 8, 10)
&vpx_highbd_v_predictor_32x32_c, 32, ));
10),
make_tuple(&vpx_highbd_tm_predictor_4x4_sse2,
&vpx_highbd_tm_predictor_4x4_c, 4, 10),
make_tuple(&vpx_highbd_tm_predictor_8x8_sse2,
&vpx_highbd_tm_predictor_8x8_c, 8, 10)));
INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest, INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest,
::testing::Values( ::testing::Values(
make_tuple(&vpx_highbd_dc_predictor_32x32_sse2, IntraPredFunc(&vpx_highbd_dc_predictor_32x32_sse2,
&vpx_highbd_dc_predictor_32x32_c, 32, &vpx_highbd_dc_predictor_32x32_c, 32, 12),
12), IntraPredFunc(&vpx_highbd_tm_predictor_16x16_sse2,
make_tuple(&vpx_highbd_tm_predictor_16x16_sse2, &vpx_highbd_tm_predictor_16x16_c, 16, 12),
&vpx_highbd_tm_predictor_16x16_c, 16, IntraPredFunc(&vpx_highbd_tm_predictor_32x32_sse2,
12), &vpx_highbd_tm_predictor_32x32_c, 32, 12),
make_tuple(&vpx_highbd_tm_predictor_32x32_sse2, IntraPredFunc(&vpx_highbd_dc_predictor_4x4_sse2,
&vpx_highbd_tm_predictor_32x32_c, 32, &vpx_highbd_dc_predictor_4x4_c, 4, 12),
12), IntraPredFunc(&vpx_highbd_dc_predictor_8x8_sse2,
make_tuple(&vpx_highbd_dc_predictor_4x4_sse2, &vpx_highbd_dc_predictor_8x8_c, 8, 12),
&vpx_highbd_dc_predictor_4x4_c, 4, 12), IntraPredFunc(&vpx_highbd_dc_predictor_16x16_sse2,
make_tuple(&vpx_highbd_dc_predictor_8x8_sse2, &vpx_highbd_dc_predictor_16x16_c, 16, 12),
&vpx_highbd_dc_predictor_8x8_c, 8, 12), IntraPredFunc(&vpx_highbd_v_predictor_4x4_sse2,
make_tuple(&vpx_highbd_dc_predictor_16x16_sse2, &vpx_highbd_v_predictor_4x4_c, 4, 12),
&vpx_highbd_dc_predictor_16x16_c, 16, IntraPredFunc(&vpx_highbd_v_predictor_8x8_sse2,
12), &vpx_highbd_v_predictor_8x8_c, 8, 12),
make_tuple(&vpx_highbd_v_predictor_4x4_sse2, IntraPredFunc(&vpx_highbd_v_predictor_16x16_sse2,
&vpx_highbd_v_predictor_4x4_c, 4, 12), &vpx_highbd_v_predictor_16x16_c, 16, 12),
make_tuple(&vpx_highbd_v_predictor_8x8_sse2, IntraPredFunc(&vpx_highbd_v_predictor_32x32_sse2,
&vpx_highbd_v_predictor_8x8_c, 8, 12), &vpx_highbd_v_predictor_32x32_c, 32, 12),
make_tuple(&vpx_highbd_v_predictor_16x16_sse2, IntraPredFunc(&vpx_highbd_tm_predictor_4x4_sse2,
&vpx_highbd_v_predictor_16x16_c, 16, &vpx_highbd_tm_predictor_4x4_c, 4, 12),
12), IntraPredFunc(&vpx_highbd_tm_predictor_8x8_sse2,
make_tuple(&vpx_highbd_v_predictor_32x32_sse2, &vpx_highbd_tm_predictor_8x8_c, 8, 12)
&vpx_highbd_v_predictor_32x32_c, 32, ));
12),
make_tuple(&vpx_highbd_tm_predictor_4x4_sse2,
&vpx_highbd_tm_predictor_4x4_c, 4, 12),
make_tuple(&vpx_highbd_tm_predictor_8x8_sse2,
&vpx_highbd_tm_predictor_8x8_c, 8, 12)));
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
#endif // HAVE_SSE2 #endif // HAVE_SSE2