Commit 2bcf280e authored by David Barker's avatar David Barker Committed by Debargha Mukherjee

Prepare for vectorizing highbd warp filter

This applies the same refactorings to highbd_warp_plane
which were applied to warp_plane a while ago, and lays the
groundwork for the relevant tests.

Change-Id: Ic4c00bce1accc5a3624bba0c3b4b325e69a42c1a
parent 417f58a6
......@@ -670,6 +670,10 @@ if ((aom_config("CONFIG_WARPED_MOTION") eq "yes") ||
(aom_config("CONFIG_GLOBAL_MOTION") eq "yes")) {
add_proto qw/void av1_warp_affine/, "int32_t *mat, uint8_t *ref, int width, int height, int stride, uint8_t *pred, int p_col, int p_row, int p_width, int p_height, int p_stride, int subsampling_x, int subsampling_y, int ref_frm, int32_t alpha, int32_t beta, int32_t gamma, int32_t delta";
specialize qw/av1_warp_affine sse2/;
if (aom_config("CONFIG_AOM_HIGHBITDEPTH") eq "yes") {
add_proto qw/void av1_highbd_warp_affine/, "int32_t *mat, uint16_t *ref, int width, int height, int stride, uint16_t *pred, int p_col, int p_row, int p_width, int p_height, int p_stride, int subsampling_x, int subsampling_y, int bd, int ref_frm, int32_t alpha, int32_t beta, int32_t gamma, int32_t delta";
}
}
# LOOP_RESTORATION functions
......
This diff is collapsed.
......@@ -16,6 +16,9 @@ using std::tr1::tuple;
using std::tr1::make_tuple;
using libaom_test::ACMRandom;
using libaom_test::AV1WarpFilter::AV1WarpFilterTest;
#if CONFIG_AOM_HIGHBITDEPTH
using libaom_test::AV1HighbdWarpFilter::AV1HighbdWarpFilterTest;
#endif
namespace {
......
......@@ -17,6 +17,10 @@ using std::vector;
using libaom_test::ACMRandom;
using libaom_test::AV1WarpFilter::AV1WarpFilterTest;
using libaom_test::AV1WarpFilter::WarpTestParam;
#if CONFIG_AOM_HIGHBITDEPTH
using libaom_test::AV1HighbdWarpFilter::AV1HighbdWarpFilterTest;
using libaom_test::AV1HighbdWarpFilter::HighbdWarpTestParam;
#endif
::testing::internal::ParamGenerator<WarpTestParam>
libaom_test::AV1WarpFilter::GetDefaultParams() {
......@@ -42,6 +46,7 @@ int32_t AV1WarpFilterTest::random_param(int bits) {
if ((rnd_.Rand8()) & 1) return -v;
return v;
}
void AV1WarpFilterTest::generate_model(int32_t *mat, int32_t *alpha,
int32_t *beta, int32_t *gamma,
int32_t *delta) {
......@@ -73,7 +78,7 @@ void AV1WarpFilterTest::generate_model(int32_t *mat, int32_t *alpha,
(1 << WARPEDMODEL_PREC_BITS);
if ((4 * abs(*alpha) + 7 * abs(*beta) > (1 << WARPEDMODEL_PREC_BITS)) ||
(4 * abs(*gamma) + 7 * abs(*delta) > (1 << WARPEDMODEL_PREC_BITS)))
(4 * abs(*gamma) + 4 * abs(*delta) > (1 << WARPEDMODEL_PREC_BITS)))
continue;
// We have a valid model, so finish
......@@ -103,7 +108,6 @@ void AV1WarpFilterTest::RunCheckOutput(warp_affine_func test_impl) {
memset(input + i * stride + w, input[i * stride + (w - 1)], border);
}
/* Try different sizes of prediction block */
for (i = 0; i < num_iters; ++i) {
for (sub_x = 0; sub_x < 2; ++sub_x)
for (sub_y = 0; sub_y < 2; ++sub_y) {
......@@ -121,3 +125,122 @@ void AV1WarpFilterTest::RunCheckOutput(warp_affine_func test_impl) {
}
}
}
#if CONFIG_AOM_HIGHBITDEPTH
::testing::internal::ParamGenerator<HighbdWarpTestParam>
libaom_test::AV1HighbdWarpFilter::GetDefaultParams() {
const HighbdWarpTestParam defaultParams[] = {
make_tuple(4, 4, 50000, 8), make_tuple(8, 8, 50000, 8),
make_tuple(64, 64, 1000, 8), make_tuple(4, 16, 20000, 8),
make_tuple(32, 8, 10000, 8), make_tuple(4, 4, 50000, 10),
make_tuple(8, 8, 50000, 10), make_tuple(64, 64, 1000, 10),
make_tuple(4, 16, 20000, 10), make_tuple(32, 8, 10000, 10),
make_tuple(4, 4, 50000, 12), make_tuple(8, 8, 50000, 12),
make_tuple(64, 64, 1000, 12), make_tuple(4, 16, 20000, 12),
make_tuple(32, 8, 10000, 12),
};
return ::testing::ValuesIn(defaultParams);
}
AV1HighbdWarpFilterTest::~AV1HighbdWarpFilterTest() {}
void AV1HighbdWarpFilterTest::SetUp() {
rnd_.Reset(ACMRandom::DeterministicSeed());
}
void AV1HighbdWarpFilterTest::TearDown() { libaom_test::ClearSystemState(); }
int32_t AV1HighbdWarpFilterTest::random_param(int bits) {
// 1 in 8 chance of generating zero (arbitrarily chosen)
if (((rnd_.Rand8()) & 7) == 0) return 0;
// Otherwise, enerate uniform values in the range
// [-(1 << bits), 1] U [1, 1<<bits]
int32_t v = 1 + (rnd_.Rand16() & ((1 << bits) - 1));
if ((rnd_.Rand8()) & 1) return -v;
return v;
}
void AV1HighbdWarpFilterTest::generate_model(int32_t *mat, int32_t *alpha,
int32_t *beta, int32_t *gamma,
int32_t *delta) {
while (1) {
mat[0] = random_param(WARPEDMODEL_PREC_BITS + 6);
mat[1] = random_param(WARPEDMODEL_PREC_BITS + 6);
mat[2] = (random_param(WARPEDMODEL_PREC_BITS - 3)) +
(1 << WARPEDMODEL_PREC_BITS);
mat[3] = random_param(WARPEDMODEL_PREC_BITS - 3);
// 50/50 chance of generating ROTZOOM vs. AFFINE models
if (rnd_.Rand8() & 1) {
// AFFINE
mat[4] = random_param(WARPEDMODEL_PREC_BITS - 3);
mat[5] = (random_param(WARPEDMODEL_PREC_BITS - 3)) +
(1 << WARPEDMODEL_PREC_BITS);
} else {
mat[4] = -mat[3];
mat[5] = mat[2];
}
// Calculate the derived parameters and check that they are suitable
// for the warp filter.
assert(mat[2] != 0);
*alpha = mat[2] - (1 << WARPEDMODEL_PREC_BITS);
*beta = mat[3];
*gamma = ((int64_t)mat[4] << WARPEDMODEL_PREC_BITS) / mat[2];
*delta = mat[5] - (((int64_t)mat[3] * mat[4] + (mat[2] / 2)) / mat[2]) -
(1 << WARPEDMODEL_PREC_BITS);
if ((4 * abs(*alpha) + 7 * abs(*beta) > (1 << WARPEDMODEL_PREC_BITS)) ||
(4 * abs(*gamma) + 4 * abs(*delta) > (1 << WARPEDMODEL_PREC_BITS)))
continue;
// We have a valid model, so finish
return;
}
}
void AV1HighbdWarpFilterTest::RunCheckOutput(
highbd_warp_affine_func test_impl) {
const int w = 128, h = 128;
const int border = 16;
const int stride = w + 2 * border;
const int out_w = GET_PARAM(0), out_h = GET_PARAM(1);
const int num_iters = GET_PARAM(2);
const int bd = GET_PARAM(3);
const int mask = (1 << bd) - 1;
int i, j, sub_x, sub_y;
uint16_t *input_ = new uint16_t[h * stride];
uint16_t *input = input_ + border;
uint16_t *output = new uint16_t[out_w * out_h];
uint16_t *output2 = new uint16_t[out_w * out_h];
int32_t mat[8], alpha, beta, gamma, delta;
// Generate an input block and extend its borders horizontally
for (i = 0; i < h; ++i)
for (j = 0; j < w; ++j) input[i * stride + j] = rnd_.Rand16() & mask;
for (i = 0; i < h; ++i) {
for (j = 0; j < border; ++j) {
input[i * stride - border + j] = input[i * stride];
input[i * stride + w + j] = input[i * stride + (w - 1)];
}
}
for (i = 0; i < num_iters; ++i) {
for (sub_x = 0; sub_x < 2; ++sub_x)
for (sub_y = 0; sub_y < 2; ++sub_y) {
generate_model(mat, &alpha, &beta, &gamma, &delta);
av1_highbd_warp_affine_c(mat, input, w, h, stride, output, 32, 32,
out_w, out_h, out_w, sub_x, sub_y, bd, 0,
alpha, beta, gamma, delta);
test_impl(mat, input, w, h, stride, output2, 32, 32, out_w, out_h,
out_w, sub_x, sub_y, bd, 0, alpha, beta, gamma, delta);
for (j = 0; j < out_w * out_h; ++j)
ASSERT_EQ(output[j], output2[j])
<< "Pixel mismatch at index " << j << " = (" << (j % out_w)
<< ", " << (j / out_w) << ") on iteration " << i;
}
}
}
#endif // CONFIG_AOM_HIGHBITDEPTH
......@@ -56,6 +56,39 @@ class AV1WarpFilterTest : public ::testing::TestWithParam<WarpTestParam> {
} // namespace AV1WarpFilter
#if CONFIG_AOM_HIGHBITDEPTH
namespace AV1HighbdWarpFilter {
typedef void (*highbd_warp_affine_func)(
int32_t *mat, uint16_t *ref, int width, int height, int stride,
uint16_t *pred, int p_col, int p_row, int p_width, int p_height,
int p_stride, int subsampling_x, int subsampling_y, int bd, int ref_frm,
int32_t alpha, int32_t beta, int32_t gamma, int32_t delta);
typedef std::tr1::tuple<int, int, int, int> HighbdWarpTestParam;
::testing::internal::ParamGenerator<HighbdWarpTestParam> GetDefaultParams();
class AV1HighbdWarpFilterTest
: public ::testing::TestWithParam<HighbdWarpTestParam> {
public:
virtual ~AV1HighbdWarpFilterTest();
virtual void SetUp();
virtual void TearDown();
protected:
int32_t random_param(int bits);
void generate_model(int32_t *mat, int32_t *alpha, int32_t *beta,
int32_t *gamma, int32_t *delta);
void RunCheckOutput(highbd_warp_affine_func test_impl);
libaom_test::ACMRandom rnd_;
};
} // namespace AV1HighbdWarpFilter
#endif // CONFIG_AOM_HIGHBITDEPTH
} // namespace libaom_test
#endif // TEST_WARP_FILTER_TEST_UTIL_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment