test: apply clang-format v5.0.0
Change-Id: Iee91f5f6314c43556791850db19687ccac14c8be
diff --git a/test/av1_convolve_2d_test.cc b/test/av1_convolve_2d_test.cc
index 50154e9..69d0043 100644
--- a/test/av1_convolve_2d_test.cc
+++ b/test/av1_convolve_2d_test.cc
@@ -13,8 +13,8 @@
#include "test/av1_convolve_2d_test_util.h"
using libaom_test::ACMRandom;
-using libaom_test::AV1Convolve2D::AV1Convolve2DTest;
using libaom_test::AV1Convolve2D::AV1Convolve2DSrTest;
+using libaom_test::AV1Convolve2D::AV1Convolve2DTest;
using std::tr1::make_tuple;
using std::tr1::tuple;
#if CONFIG_JNT_COMP
diff --git a/test/av1_horz_only_frame_superres_test.cc b/test/av1_horz_only_frame_superres_test.cc
index 7ef2a27..1e4bd49 100644
--- a/test/av1_horz_only_frame_superres_test.cc
+++ b/test/av1_horz_only_frame_superres_test.cc
@@ -29,9 +29,9 @@
const int kVPad = 32;
const int kHPad = 32;
-using std::tr1::tuple;
-using std::tr1::make_tuple;
using libaom_test::ACMRandom;
+using std::tr1::make_tuple;
+using std::tr1::tuple;
template <typename Pixel>
class TestImage {
diff --git a/test/coding_path_sync.cc b/test/coding_path_sync.cc
index fa9cbbb..0a4694f 100644
--- a/test/coding_path_sync.cc
+++ b/test/coding_path_sync.cc
@@ -53,7 +53,9 @@
// choose the chroma subsampling
{
const aom_img_fmt_t fmts[] = {
- AOM_IMG_FMT_I420, AOM_IMG_FMT_I422, AOM_IMG_FMT_I444,
+ AOM_IMG_FMT_I420,
+ AOM_IMG_FMT_I422,
+ AOM_IMG_FMT_I444,
};
format_ = fmts[rnd_.PseudoUniform(NELEMENTS(fmts))];
diff --git a/test/end_to_end_test.cc b/test/end_to_end_test.cc
index 1e8bd31..1ac0ae9 100644
--- a/test/end_to_end_test.cc
+++ b/test/end_to_end_test.cc
@@ -65,7 +65,8 @@
// Encoding modes tested
const libaom_test::TestMode kEncodingModeVectors[] = {
- ::libaom_test::kTwoPassGood, ::libaom_test::kOnePassGood,
+ ::libaom_test::kTwoPassGood,
+ ::libaom_test::kOnePassGood,
::libaom_test::kRealTime,
};
diff --git a/test/hiprec_convolve_test_util.cc b/test/hiprec_convolve_test_util.cc
index 3a082ef..694e0ae 100644
--- a/test/hiprec_convolve_test_util.cc
+++ b/test/hiprec_convolve_test_util.cc
@@ -52,7 +52,8 @@
::testing::internal::ParamGenerator<HiprecConvolveParam> BuildParams(
hiprec_convolve_func filter) {
const HiprecConvolveParam params[] = {
- make_tuple(8, 8, 50000, filter), make_tuple(64, 64, 1000, filter),
+ make_tuple(8, 8, 50000, filter),
+ make_tuple(64, 64, 1000, filter),
make_tuple(32, 8, 10000, filter),
};
return ::testing::ValuesIn(params);
diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc
index 203cc53..ec46336 100644
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -163,7 +163,6 @@
// -----------------------------------------------------------------------------
// High Bit Depth Tests
-
#define highbd_entry(type, width, height, opt, bd) \
IntraPredFunc<HighbdIntraPred>( \
&aom_highbd_##type##_predictor_##width##x##height##_##opt, \
@@ -348,8 +347,10 @@
#if HAVE_SSSE3
const IntraPredFunc<IntraPred> LowbdIntraPredTestVectorSsse3[] = {
- lowbd_entry(d63e, 4, 4, ssse3), lowbd_intrapred(d45e, ssse3),
- lowbd_intrapred(paeth, ssse3), lowbd_intrapred(smooth, ssse3),
+ lowbd_entry(d63e, 4, 4, ssse3),
+ lowbd_intrapred(d45e, ssse3),
+ lowbd_intrapred(paeth, ssse3),
+ lowbd_intrapred(smooth, ssse3),
};
INSTANTIATE_TEST_CASE_P(SSSE3, LowbdIntraPredTest,
diff --git a/test/monochrome_test.cc b/test/monochrome_test.cc
index f9b9681..ebccba5 100644
--- a/test/monochrome_test.cc
+++ b/test/monochrome_test.cc
@@ -7,7 +7,7 @@
* obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
-*/
+ */
#include <climits>
#include <vector>
diff --git a/test/motion_vector_test.cc b/test/motion_vector_test.cc
index c067e92..27eb938 100644
--- a/test/motion_vector_test.cc
+++ b/test/motion_vector_test.cc
@@ -22,7 +22,8 @@
// Encoding modes
const libaom_test::TestMode kEncodingModeVectors[] = {
- ::libaom_test::kTwoPassGood, ::libaom_test::kOnePassGood,
+ ::libaom_test::kTwoPassGood,
+ ::libaom_test::kOnePassGood,
};
// Encoding speeds
diff --git a/test/selfguided_filter_test.cc b/test/selfguided_filter_test.cc
index 0215e60..5e2969c 100644
--- a/test/selfguided_filter_test.cc
+++ b/test/selfguided_filter_test.cc
@@ -68,12 +68,10 @@
for (j = -16; j < width + 16; ++j)
input[i * stride + j] = rnd.Rand16() & 0xFF;
- int xqd[2] = {
- SGRPROJ_PRJ_MIN0 +
- rnd.PseudoUniform(SGRPROJ_PRJ_MAX0 + 1 - SGRPROJ_PRJ_MIN0),
- SGRPROJ_PRJ_MIN1 +
- rnd.PseudoUniform(SGRPROJ_PRJ_MAX1 + 1 - SGRPROJ_PRJ_MIN1)
- };
+ int xqd[2] = { SGRPROJ_PRJ_MIN0 + rnd.PseudoUniform(SGRPROJ_PRJ_MAX0 + 1 -
+ SGRPROJ_PRJ_MIN0),
+ SGRPROJ_PRJ_MIN1 + rnd.PseudoUniform(SGRPROJ_PRJ_MAX1 + 1 -
+ SGRPROJ_PRJ_MIN1) };
// Fix a parameter set, since the speed depends slightly on r.
// Change this to test different combinations of values of r.
int eps = 15;
@@ -157,12 +155,10 @@
for (k = -16; k < max_w + 16; ++k)
input[j * stride + k] = rnd.Rand16() & 0xFF;
- int xqd[2] = {
- SGRPROJ_PRJ_MIN0 +
- rnd.PseudoUniform(SGRPROJ_PRJ_MAX0 + 1 - SGRPROJ_PRJ_MIN0),
- SGRPROJ_PRJ_MIN1 +
- rnd.PseudoUniform(SGRPROJ_PRJ_MAX1 + 1 - SGRPROJ_PRJ_MIN1)
- };
+ int xqd[2] = { SGRPROJ_PRJ_MIN0 + rnd.PseudoUniform(SGRPROJ_PRJ_MAX0 + 1 -
+ SGRPROJ_PRJ_MIN0),
+ SGRPROJ_PRJ_MIN1 + rnd.PseudoUniform(SGRPROJ_PRJ_MAX1 + 1 -
+ SGRPROJ_PRJ_MIN1) };
int eps = rnd.PseudoUniform(1 << SGRPROJ_PARAMS_BITS);
// Test various tile sizes around 256x256
@@ -248,12 +244,10 @@
for (j = -16; j < width + 16; ++j)
input[i * stride + j] = rnd.Rand16() & mask;
- int xqd[2] = {
- SGRPROJ_PRJ_MIN0 +
- rnd.PseudoUniform(SGRPROJ_PRJ_MAX0 + 1 - SGRPROJ_PRJ_MIN0),
- SGRPROJ_PRJ_MIN1 +
- rnd.PseudoUniform(SGRPROJ_PRJ_MAX1 + 1 - SGRPROJ_PRJ_MIN1)
- };
+ int xqd[2] = { SGRPROJ_PRJ_MIN0 + rnd.PseudoUniform(SGRPROJ_PRJ_MAX0 + 1 -
+ SGRPROJ_PRJ_MIN0),
+ SGRPROJ_PRJ_MIN1 + rnd.PseudoUniform(SGRPROJ_PRJ_MAX1 + 1 -
+ SGRPROJ_PRJ_MIN1) };
// Fix a parameter set, since the speed depends slightly on r.
// Change this to test different combinations of values of r.
int eps = 15;
@@ -342,12 +336,10 @@
for (k = -16; k < max_w + 16; ++k)
input[j * stride + k] = rnd.Rand16() & mask;
- int xqd[2] = {
- SGRPROJ_PRJ_MIN0 +
- rnd.PseudoUniform(SGRPROJ_PRJ_MAX0 + 1 - SGRPROJ_PRJ_MIN0),
- SGRPROJ_PRJ_MIN1 +
- rnd.PseudoUniform(SGRPROJ_PRJ_MAX1 + 1 - SGRPROJ_PRJ_MIN1)
- };
+ int xqd[2] = { SGRPROJ_PRJ_MIN0 + rnd.PseudoUniform(SGRPROJ_PRJ_MAX0 + 1 -
+ SGRPROJ_PRJ_MIN0),
+ SGRPROJ_PRJ_MIN1 + rnd.PseudoUniform(SGRPROJ_PRJ_MAX1 + 1 -
+ SGRPROJ_PRJ_MIN1) };
int eps = rnd.PseudoUniform(1 << SGRPROJ_PARAMS_BITS);
// Test various tile sizes around 256x256
diff --git a/test/simd_cmp_impl.h b/test/simd_cmp_impl.h
index 94122e0..e1f1d5c 100644
--- a/test/simd_cmp_impl.h
+++ b/test/simd_cmp_impl.h
@@ -379,10 +379,10 @@
fptr simd;
} mapping;
-#define MAP(name) \
- { \
- #name, \
- reinterpret_cast < fptr > (c_##name), reinterpret_cast < fptr > (name) \
+#define MAP(name) \
+ { \
+ #name, reinterpret_cast < fptr > (c_##name), \
+ reinterpret_cast < fptr > (name) \
}
const mapping m[] = { MAP(v64_sad_u8),
diff --git a/test/test_libaom.cc b/test/test_libaom.cc
index 5aa497c..6f1d473 100644
--- a/test/test_libaom.cc
+++ b/test/test_libaom.cc
@@ -62,10 +62,9 @@
if (!(simd_caps & HAS_AVX2)) append_negative_gtest_filter("AVX2");
#endif // ARCH_X86 || ARCH_X86_64
+// Shared library builds don't support whitebox tests that exercise internal
+// symbols.
#if !CONFIG_SHARED
-// Shared library builds don't support whitebox tests
-// that exercise internal symbols.
-
#if CONFIG_AV1
av1_rtcd();
#endif // CONFIG_AV1
