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

test/: apply clang-format

Browse Source 
Change-Id: I1138fbeff5f63beb5c0de2c357793da12502d453
This commit is contained in:
clang-format
2016-08-11 17:46:05 -07:00
committed by James Zern
parent 712e66dafa
commit 3a826f1d3d
91 changed files with 3429 additions and 4555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
test/subtract_test.cc
View File

@@ -24,18 +24,16 @@
#define USE_SPEED_TEST (0)
typedef void (*SubtractFunc)(int rows, int cols,
int16_t *diff_ptr, ptrdiff_t diff_stride,
const uint8_t *src_ptr, ptrdiff_t src_stride,
const uint8_t *pred_ptr, ptrdiff_t pred_stride);
typedef void (*SubtractFunc)(int rows, int cols, int16_t *diff_ptr,
ptrdiff_t diff_stride, const uint8_t *src_ptr,
ptrdiff_t src_stride, const uint8_t *pred_ptr,
ptrdiff_t pred_stride);
namespace {
class VP9SubtractBlockTest : public ::testing::TestWithParam<SubtractFunc> {
public:
virtual void TearDown() {
libvpx_test::ClearSystemState();
}
virtual void TearDown() { libvpx_test::ClearSystemState(); }
};
using libvpx_test::ACMRandom;
@@ -52,7 +50,7 @@ TEST_P(VP9SubtractBlockTest, SimpleSubtract) {
vpx_memalign(16, sizeof(*diff) * block_width * block_height * 2));
uint8_t *pred = reinterpret_cast<uint8_t *>(
vpx_memalign(16, block_width * block_height * 2));
uint8_t *src = reinterpret_cast<uint8_t *>(
uint8_t *src = reinterpret_cast<uint8_t *>(
vpx_memalign(16, block_width * block_height * 2));
for (int n = 0; n < 100; n++) {
@@ -63,29 +61,26 @@ TEST_P(VP9SubtractBlockTest, SimpleSubtract) {
}
}
GetParam()(block_height, block_width, diff, block_width,
src, block_width, pred, block_width);
GetParam()(block_height, block_width, diff, block_width, src, block_width,
pred, block_width);
for (int r = 0; r < block_height; ++r) {
for (int c = 0; c < block_width; ++c) {
EXPECT_EQ(diff[r * block_width + c],
(src[r * block_width + c] -
pred[r * block_width + c])) << "r = " << r
<< ", c = " << c
<< ", bs = " << bsize;
(src[r * block_width + c] - pred[r * block_width + c]))
<< "r = " << r << ", c = " << c << ", bs = " << bsize;
}
}
GetParam()(block_height, block_width, diff, block_width * 2,
src, block_width * 2, pred, block_width * 2);
GetParam()(block_height, block_width, diff, block_width * 2, src,
block_width * 2, pred, block_width * 2);
for (int r = 0; r < block_height; ++r) {
for (int c = 0; c < block_width; ++c) {
EXPECT_EQ(diff[r * block_width * 2 + c],
(src[r * block_width * 2 + c] -
pred[r * block_width * 2 + c])) << "r = " << r
<< ", c = " << c
<< ", bs = " << bsize;
EXPECT_EQ(
diff[r * block_width * 2 + c],
(src[r * block_width * 2 + c] - pred[r * block_width * 2 + c]))
<< "r = " << r << ", c = " << c << ", bs = " << bsize;
}
}
}
@@ -111,11 +106,10 @@ INSTANTIATE_TEST_CASE_P(MSA, VP9SubtractBlockTest,
::testing::Values(vpx_subtract_block_msa));
#endif
typedef void (*HBDSubtractFunc)(int rows, int cols,
int16_t *diff_ptr, ptrdiff_t diff_stride,
const uint8_t *src_ptr, ptrdiff_t src_stride,
const uint8_t *pred_ptr, ptrdiff_t pred_stride,
int bd);
typedef void (*HBDSubtractFunc)(int rows, int cols, int16_t *diff_ptr,
ptrdiff_t diff_stride, const uint8_t *src_ptr,
ptrdiff_t src_stride, const uint8_t *pred_ptr,
ptrdiff_t pred_stride, int bd);
using ::std::tr1::get;
using ::std::tr1::make_tuple;
@@ -179,8 +173,8 @@ void VP10HBDSubtractBlockTest::RunForSpeed() {
}
for (i = 0; i < test_num; ++i) {
func_(block_height_, block_width_, diff_, block_width_,
src_, block_width_, pred_, block_width_, bit_depth_);
func_(block_height_, block_width_, diff_, block_width_, src_, block_width_,
pred_, block_width_, bit_depth_);
}
}
@@ -197,8 +191,8 @@ void VP10HBDSubtractBlockTest::CheckResult() {
CONVERT_TO_SHORTPTR(pred_)[j] = rnd_.Rand16() & mask;
}
func_(block_height_, block_width_, diff_, block_width_,
src_, block_width_, pred_, block_width_, bit_depth_);
func_(block_height_, block_width_, diff_, block_width_, src_, block_width_,
pred_, block_width_, bit_depth_);
for (int r = 0; r < block_height_; ++r) {
for (int c = 0; c < block_width_; ++c) {
@@ -211,50 +205,47 @@ void VP10HBDSubtractBlockTest::CheckResult() {
}
}
TEST_P(VP10HBDSubtractBlockTest, CheckResult) {
CheckResult();
}
TEST_P(VP10HBDSubtractBlockTest, CheckResult) { CheckResult(); }
#if USE_SPEED_TEST
TEST_P(VP10HBDSubtractBlockTest, CheckSpeed) {
RunForSpeed();
}
TEST_P(VP10HBDSubtractBlockTest, CheckSpeed) { RunForSpeed(); }
#endif // USE_SPEED_TEST
#if HAVE_SSE2
INSTANTIATE_TEST_CASE_P(SSE2, VP10HBDSubtractBlockTest, ::testing::Values(
make_tuple(4, 4, 12, vpx_highbd_subtract_block_sse2),
make_tuple(4, 4, 12, vpx_highbd_subtract_block_c),
make_tuple(4, 8, 12, vpx_highbd_subtract_block_sse2),
make_tuple(4, 8, 12, vpx_highbd_subtract_block_c),
make_tuple(8, 4, 12, vpx_highbd_subtract_block_sse2),
make_tuple(8, 4, 12, vpx_highbd_subtract_block_c),
make_tuple(8, 8, 12, vpx_highbd_subtract_block_sse2),
make_tuple(8, 8, 12, vpx_highbd_subtract_block_c),
make_tuple(8, 16, 12, vpx_highbd_subtract_block_sse2),
make_tuple(8, 16, 12, vpx_highbd_subtract_block_c),
make_tuple(16, 8, 12, vpx_highbd_subtract_block_sse2),
make_tuple(16, 8, 12, vpx_highbd_subtract_block_c),
make_tuple(16, 16, 12, vpx_highbd_subtract_block_sse2),
make_tuple(16, 16, 12, vpx_highbd_subtract_block_c),
make_tuple(16, 32, 12, vpx_highbd_subtract_block_sse2),
make_tuple(16, 32, 12, vpx_highbd_subtract_block_c),
make_tuple(32, 16, 12, vpx_highbd_subtract_block_sse2),
make_tuple(32, 16, 12, vpx_highbd_subtract_block_c),
make_tuple(32, 32, 12, vpx_highbd_subtract_block_sse2),
make_tuple(32, 32, 12, vpx_highbd_subtract_block_c),
make_tuple(32, 64, 12, vpx_highbd_subtract_block_sse2),
make_tuple(32, 64, 12, vpx_highbd_subtract_block_c),
make_tuple(64, 32, 12, vpx_highbd_subtract_block_sse2),
make_tuple(64, 32, 12, vpx_highbd_subtract_block_c),
make_tuple(64, 64, 12, vpx_highbd_subtract_block_sse2),
make_tuple(64, 64, 12, vpx_highbd_subtract_block_c),
make_tuple(64, 128, 12, vpx_highbd_subtract_block_sse2),
make_tuple(64, 128, 12, vpx_highbd_subtract_block_c),
make_tuple(128, 64, 12, vpx_highbd_subtract_block_sse2),
make_tuple(128, 64, 12, vpx_highbd_subtract_block_c),
make_tuple(128, 128, 12, vpx_highbd_subtract_block_sse2),
make_tuple(128, 128, 12, vpx_highbd_subtract_block_c)));
INSTANTIATE_TEST_CASE_P(
SSE2, VP10HBDSubtractBlockTest,
::testing::Values(make_tuple(4, 4, 12, vpx_highbd_subtract_block_sse2),
make_tuple(4, 4, 12, vpx_highbd_subtract_block_c),
make_tuple(4, 8, 12, vpx_highbd_subtract_block_sse2),
make_tuple(4, 8, 12, vpx_highbd_subtract_block_c),
make_tuple(8, 4, 12, vpx_highbd_subtract_block_sse2),
make_tuple(8, 4, 12, vpx_highbd_subtract_block_c),
make_tuple(8, 8, 12, vpx_highbd_subtract_block_sse2),
make_tuple(8, 8, 12, vpx_highbd_subtract_block_c),
make_tuple(8, 16, 12, vpx_highbd_subtract_block_sse2),
make_tuple(8, 16, 12, vpx_highbd_subtract_block_c),
make_tuple(16, 8, 12, vpx_highbd_subtract_block_sse2),
make_tuple(16, 8, 12, vpx_highbd_subtract_block_c),
make_tuple(16, 16, 12, vpx_highbd_subtract_block_sse2),
make_tuple(16, 16, 12, vpx_highbd_subtract_block_c),
make_tuple(16, 32, 12, vpx_highbd_subtract_block_sse2),
make_tuple(16, 32, 12, vpx_highbd_subtract_block_c),
make_tuple(32, 16, 12, vpx_highbd_subtract_block_sse2),
make_tuple(32, 16, 12, vpx_highbd_subtract_block_c),
make_tuple(32, 32, 12, vpx_highbd_subtract_block_sse2),
make_tuple(32, 32, 12, vpx_highbd_subtract_block_c),
make_tuple(32, 64, 12, vpx_highbd_subtract_block_sse2),
make_tuple(32, 64, 12, vpx_highbd_subtract_block_c),
make_tuple(64, 32, 12, vpx_highbd_subtract_block_sse2),
make_tuple(64, 32, 12, vpx_highbd_subtract_block_c),
make_tuple(64, 64, 12, vpx_highbd_subtract_block_sse2),
make_tuple(64, 64, 12, vpx_highbd_subtract_block_c),
make_tuple(64, 128, 12, vpx_highbd_subtract_block_sse2),
make_tuple(64, 128, 12, vpx_highbd_subtract_block_c),
make_tuple(128, 64, 12, vpx_highbd_subtract_block_sse2),
make_tuple(128, 64, 12, vpx_highbd_subtract_block_c),
make_tuple(128, 128, 12, vpx_highbd_subtract_block_sse2),
make_tuple(128, 128, 12, vpx_highbd_subtract_block_c)));
#endif // HAVE_SSE2
#endif // CONFIG_VP9_HIGHBITDEPTH
} // namespace