Commit f152ff6a authored by Johann's avatar Johann

test: apply clang-format v5.0.0

Change-Id: Iee91f5f6314c43556791850db19687ccac14c8be
parent 6b41d4da
......@@ -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
......
......@@ -29,9 +29,9 @@ const int kPerfIters = 1000;
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 {
......
......@@ -53,7 +53,9 @@ class CompressedSource {
// 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))];
......
......@@ -65,7 +65,8 @@ const TestVideoParam kTestVectors[] = {
// Encoding modes tested
const libaom_test::TestMode kEncodingModeVectors[] = {
::libaom_test::kTwoPassGood, ::libaom_test::kOnePassGood,
::libaom_test::kTwoPassGood,
::libaom_test::kOnePassGood,
::libaom_test::kRealTime,
};
......
......@@ -52,7 +52,8 @@ namespace AV1HiprecConvolve {
::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);
......
......@@ -163,7 +163,6 @@ TEST_P(LowbdIntraPredTest, Bitexact) {
// -----------------------------------------------------------------------------
// 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 @@ INSTANTIATE_TEST_CASE_P(SSE2, LowbdIntraPredTest,
#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,
......
......@@ -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>
......
......@@ -22,7 +22,8 @@ namespace {
// Encoding modes
const libaom_test::TestMode kEncodingModeVectors[] = {
::libaom_test::kTwoPassGood, ::libaom_test::kOnePassGood,
::libaom_test::kTwoPassGood,
::libaom_test::kOnePassGood,
};
// Encoding speeds
......
......@@ -68,12 +68,10 @@ class AV1SelfguidedFilterTest
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 @@ class AV1SelfguidedFilterTest
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 @@ class AV1HighbdSelfguidedFilterTest
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 @@ class AV1HighbdSelfguidedFilterTest
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
......
......@@ -379,10 +379,10 @@ typedef struct {
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),
......
......@@ -62,10 +62,9 @@ int main(int argc, char **argv) {
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
......
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