mozilla
/
aom
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

sad_test: drop '_t' from local typenames 

_t is reserved by posix

+ switch to camelcase
  http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Type_Names

Change-Id: I60746bc93ba2446c1458a1f09fd1e49cc2e68534
This commit is contained in:
James Zern 2014-07-16 18:59:28 -07:00
Родитель 25d74e69dd
Коммит 18e733bd1d
1 изменённых файлов: 112 добавлений и 114 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

204
test/sad_test.cc
Просмотреть файл

@ -30,29 +30,27 @@
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
typedef unsigned int (*sad_m_by_n_fn_t)(const unsigned char *source_ptr, typedef unsigned int (*SadMxNFunc)(const unsigned char *source_ptr,
int source_stride, int source_stride,
const unsigned char *reference_ptr, const unsigned char *reference_ptr,
int reference_stride, int reference_stride,
unsigned int max_sad); unsigned int max_sad);
typedef std::tr1::tuple<int, int, sad_m_by_n_fn_t> sad_m_by_n_test_param_t; typedef std::tr1::tuple<int, int, SadMxNFunc> SadMxNParam;
#endif #endif
#if CONFIG_VP9_ENCODER #if CONFIG_VP9_ENCODER
typedef unsigned int (*sad_m_by_n_fn_vp9_t)(const unsigned char *source_ptr, typedef unsigned int (*SadMxNVp9Func)(const unsigned char *source_ptr,
int source_stride, int source_stride,
const unsigned char *reference_ptr, const unsigned char *reference_ptr,
int reference_stride); int reference_stride);
typedef std::tr1::tuple<int, int, sad_m_by_n_fn_vp9_t> typedef std::tr1::tuple<int, int, SadMxNVp9Func> SadMxNVp9Param;
sad_m_by_n_test_param_vp9_t;
#endif #endif
typedef void (*sad_n_by_n_by_4_fn_t)(const uint8_t *src_ptr, typedef void (*SadMxNx4Func)(const uint8_t *src_ptr,
int src_stride, int src_stride,
const unsigned char *const ref_ptr[], const unsigned char *const ref_ptr[],
int ref_stride, int ref_stride,
unsigned int *sad_array); unsigned int *sad_array);
typedef std::tr1::tuple<int, int, sad_n_by_n_by_4_fn_t> typedef std::tr1::tuple<int, int, SadMxNx4Func> SadMxNx4Param;
sad_n_by_n_by_4_test_param_t;
using libvpx_test::ACMRandom; using libvpx_test::ACMRandom;
@ -140,7 +138,7 @@ class SADTestBase : public ::testing::Test {
class SADx4Test class SADx4Test
: public SADTestBase, : public SADTestBase,
public ::testing::WithParamInterface<sad_n_by_n_by_4_test_param_t> { public ::testing::WithParamInterface<SadMxNx4Param> {
public: public:
SADx4Test() : SADTestBase(GET_PARAM(0), GET_PARAM(1)) {} SADx4Test() : SADTestBase(GET_PARAM(0), GET_PARAM(1)) {}
@ -169,7 +167,7 @@ class SADx4Test
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
class SADTest class SADTest
: public SADTestBase, : public SADTestBase,
public ::testing::WithParamInterface<sad_m_by_n_test_param_t> { public ::testing::WithParamInterface<SadMxNParam> {
public: public:
SADTest() : SADTestBase(GET_PARAM(0), GET_PARAM(1)) {} SADTest() : SADTestBase(GET_PARAM(0), GET_PARAM(1)) {}
@ -201,7 +199,7 @@ class SADTest
#if CONFIG_VP9_ENCODER #if CONFIG_VP9_ENCODER
class SADVP9Test class SADVP9Test
: public SADTestBase, : public SADTestBase,
public ::testing::WithParamInterface<sad_m_by_n_test_param_vp9_t> { public ::testing::WithParamInterface<SadMxNVp9Param> {
public: public:
SADVP9Test() : SADTestBase(GET_PARAM(0), GET_PARAM(1)) {} SADVP9Test() : SADTestBase(GET_PARAM(0), GET_PARAM(1)) {}
@ -382,12 +380,12 @@ using std::tr1::make_tuple;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// C functions // C functions
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
const sad_m_by_n_fn_t sad_16x16_c = vp8_sad16x16_c; const SadMxNFunc sad_16x16_c = vp8_sad16x16_c;
const sad_m_by_n_fn_t sad_8x16_c = vp8_sad8x16_c; const SadMxNFunc sad_8x16_c = vp8_sad8x16_c;
const sad_m_by_n_fn_t sad_16x8_c = vp8_sad16x8_c; const SadMxNFunc sad_16x8_c = vp8_sad16x8_c;
const sad_m_by_n_fn_t sad_8x8_c = vp8_sad8x8_c; const SadMxNFunc sad_8x8_c = vp8_sad8x8_c;
const sad_m_by_n_fn_t sad_4x4_c = vp8_sad4x4_c; const SadMxNFunc sad_4x4_c = vp8_sad4x4_c;
const sad_m_by_n_test_param_t c_tests[] = { const SadMxNParam c_tests[] = {
make_tuple(16, 16, sad_16x16_c), make_tuple(16, 16, sad_16x16_c),
make_tuple(8, 16, sad_8x16_c), make_tuple(8, 16, sad_8x16_c),
make_tuple(16, 8, sad_16x8_c), make_tuple(16, 8, sad_16x8_c),
@ -398,16 +396,16 @@ INSTANTIATE_TEST_CASE_P(C, SADTest, ::testing::ValuesIn(c_tests));
#endif // CONFIG_VP8_ENCODER #endif // CONFIG_VP8_ENCODER
#if CONFIG_VP9_ENCODER #if CONFIG_VP9_ENCODER
const sad_m_by_n_fn_vp9_t sad_64x64_c_vp9 = vp9_sad64x64_c; const SadMxNVp9Func sad_64x64_c_vp9 = vp9_sad64x64_c;
const sad_m_by_n_fn_vp9_t sad_32x32_c_vp9 = vp9_sad32x32_c; const SadMxNVp9Func sad_32x32_c_vp9 = vp9_sad32x32_c;
const sad_m_by_n_fn_vp9_t sad_16x16_c_vp9 = vp9_sad16x16_c; const SadMxNVp9Func sad_16x16_c_vp9 = vp9_sad16x16_c;
const sad_m_by_n_fn_vp9_t sad_8x16_c_vp9 = vp9_sad8x16_c; const SadMxNVp9Func sad_8x16_c_vp9 = vp9_sad8x16_c;
const sad_m_by_n_fn_vp9_t sad_16x8_c_vp9 = vp9_sad16x8_c; const SadMxNVp9Func sad_16x8_c_vp9 = vp9_sad16x8_c;
const sad_m_by_n_fn_vp9_t sad_8x8_c_vp9 = vp9_sad8x8_c; const SadMxNVp9Func sad_8x8_c_vp9 = vp9_sad8x8_c;
const sad_m_by_n_fn_vp9_t sad_8x4_c_vp9 = vp9_sad8x4_c; const SadMxNVp9Func sad_8x4_c_vp9 = vp9_sad8x4_c;
const sad_m_by_n_fn_vp9_t sad_4x8_c_vp9 = vp9_sad4x8_c; const SadMxNVp9Func sad_4x8_c_vp9 = vp9_sad4x8_c;
const sad_m_by_n_fn_vp9_t sad_4x4_c_vp9 = vp9_sad4x4_c; const SadMxNVp9Func sad_4x4_c_vp9 = vp9_sad4x4_c;
const sad_m_by_n_test_param_vp9_t c_vp9_tests[] = { const SadMxNVp9Param c_vp9_tests[] = {
make_tuple(64, 64, sad_64x64_c_vp9), make_tuple(64, 64, sad_64x64_c_vp9),
make_tuple(32, 32, sad_32x32_c_vp9), make_tuple(32, 32, sad_32x32_c_vp9),
make_tuple(16, 16, sad_16x16_c_vp9), make_tuple(16, 16, sad_16x16_c_vp9),
@ -420,19 +418,19 @@ const sad_m_by_n_test_param_vp9_t c_vp9_tests[] = {
}; };
INSTANTIATE_TEST_CASE_P(C, SADVP9Test, ::testing::ValuesIn(c_vp9_tests)); INSTANTIATE_TEST_CASE_P(C, SADVP9Test, ::testing::ValuesIn(c_vp9_tests));
const sad_n_by_n_by_4_fn_t sad_64x64x4d_c = vp9_sad64x64x4d_c; const SadMxNx4Func sad_64x64x4d_c = vp9_sad64x64x4d_c;
const sad_n_by_n_by_4_fn_t sad_64x32x4d_c = vp9_sad64x32x4d_c; const SadMxNx4Func sad_64x32x4d_c = vp9_sad64x32x4d_c;
const sad_n_by_n_by_4_fn_t sad_32x64x4d_c = vp9_sad32x64x4d_c; const SadMxNx4Func sad_32x64x4d_c = vp9_sad32x64x4d_c;
const sad_n_by_n_by_4_fn_t sad_32x32x4d_c = vp9_sad32x32x4d_c; const SadMxNx4Func sad_32x32x4d_c = vp9_sad32x32x4d_c;
const sad_n_by_n_by_4_fn_t sad_32x16x4d_c = vp9_sad32x16x4d_c; const SadMxNx4Func sad_32x16x4d_c = vp9_sad32x16x4d_c;
const sad_n_by_n_by_4_fn_t sad_16x32x4d_c = vp9_sad16x32x4d_c; const SadMxNx4Func sad_16x32x4d_c = vp9_sad16x32x4d_c;
const sad_n_by_n_by_4_fn_t sad_16x16x4d_c = vp9_sad16x16x4d_c; const SadMxNx4Func sad_16x16x4d_c = vp9_sad16x16x4d_c;
const sad_n_by_n_by_4_fn_t sad_16x8x4d_c = vp9_sad16x8x4d_c; const SadMxNx4Func sad_16x8x4d_c = vp9_sad16x8x4d_c;
const sad_n_by_n_by_4_fn_t sad_8x16x4d_c = vp9_sad8x16x4d_c; const SadMxNx4Func sad_8x16x4d_c = vp9_sad8x16x4d_c;
const sad_n_by_n_by_4_fn_t sad_8x8x4d_c = vp9_sad8x8x4d_c; const SadMxNx4Func sad_8x8x4d_c = vp9_sad8x8x4d_c;
const sad_n_by_n_by_4_fn_t sad_8x4x4d_c = vp9_sad8x4x4d_c; const SadMxNx4Func sad_8x4x4d_c = vp9_sad8x4x4d_c;
const sad_n_by_n_by_4_fn_t sad_4x8x4d_c = vp9_sad4x8x4d_c; const SadMxNx4Func sad_4x8x4d_c = vp9_sad4x8x4d_c;
const sad_n_by_n_by_4_fn_t sad_4x4x4d_c = vp9_sad4x4x4d_c; const SadMxNx4Func sad_4x4x4d_c = vp9_sad4x4x4d_c;
INSTANTIATE_TEST_CASE_P(C, SADx4Test, ::testing::Values( INSTANTIATE_TEST_CASE_P(C, SADx4Test, ::testing::Values(
make_tuple(64, 64, sad_64x64x4d_c), make_tuple(64, 64, sad_64x64x4d_c),
make_tuple(64, 32, sad_64x32x4d_c), make_tuple(64, 32, sad_64x32x4d_c),
@ -453,7 +451,7 @@ INSTANTIATE_TEST_CASE_P(C, SADx4Test, ::testing::Values(
// ARM functions // ARM functions
#if HAVE_MEDIA #if HAVE_MEDIA
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
const sad_m_by_n_fn_t sad_16x16_armv6 = vp8_sad16x16_armv6; const SadMxNFunc sad_16x16_armv6 = vp8_sad16x16_armv6;
INSTANTIATE_TEST_CASE_P(MEDIA, SADTest, ::testing::Values( INSTANTIATE_TEST_CASE_P(MEDIA, SADTest, ::testing::Values(
make_tuple(16, 16, sad_16x16_armv6))); make_tuple(16, 16, sad_16x16_armv6)));
#endif // CONFIG_VP8_ENCODER #endif // CONFIG_VP8_ENCODER
@ -461,11 +459,11 @@ INSTANTIATE_TEST_CASE_P(MEDIA, SADTest, ::testing::Values(
#if HAVE_NEON #if HAVE_NEON
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
const sad_m_by_n_fn_t sad_16x16_neon = vp8_sad16x16_neon; const SadMxNFunc sad_16x16_neon = vp8_sad16x16_neon;
const sad_m_by_n_fn_t sad_8x16_neon = vp8_sad8x16_neon; const SadMxNFunc sad_8x16_neon = vp8_sad8x16_neon;
const sad_m_by_n_fn_t sad_16x8_neon = vp8_sad16x8_neon; const SadMxNFunc sad_16x8_neon = vp8_sad16x8_neon;
const sad_m_by_n_fn_t sad_8x8_neon = vp8_sad8x8_neon; const SadMxNFunc sad_8x8_neon = vp8_sad8x8_neon;
const sad_m_by_n_fn_t sad_4x4_neon = vp8_sad4x4_neon; const SadMxNFunc sad_4x4_neon = vp8_sad4x4_neon;
INSTANTIATE_TEST_CASE_P(NEON, SADTest, ::testing::Values( INSTANTIATE_TEST_CASE_P(NEON, SADTest, ::testing::Values(
make_tuple(16, 16, sad_16x16_neon), make_tuple(16, 16, sad_16x16_neon),
make_tuple(8, 16, sad_8x16_neon), make_tuple(8, 16, sad_8x16_neon),
@ -474,10 +472,10 @@ INSTANTIATE_TEST_CASE_P(NEON, SADTest, ::testing::Values(
make_tuple(4, 4, sad_4x4_neon))); make_tuple(4, 4, sad_4x4_neon)));
#endif // CONFIG_VP8_ENCODER #endif // CONFIG_VP8_ENCODER
#if CONFIG_VP9_ENCODER #if CONFIG_VP9_ENCODER
const sad_m_by_n_fn_vp9_t sad_64x64_neon_vp9 = vp9_sad64x64_neon; const SadMxNVp9Func sad_64x64_neon_vp9 = vp9_sad64x64_neon;
const sad_m_by_n_fn_vp9_t sad_32x32_neon_vp9 = vp9_sad32x32_neon; const SadMxNVp9Func sad_32x32_neon_vp9 = vp9_sad32x32_neon;
const sad_m_by_n_fn_vp9_t sad_16x16_neon_vp9 = vp9_sad16x16_neon; const SadMxNVp9Func sad_16x16_neon_vp9 = vp9_sad16x16_neon;
const sad_m_by_n_test_param_vp9_t neon_vp9_tests[] = { const SadMxNVp9Param neon_vp9_tests[] = {
make_tuple(64, 64, sad_64x64_neon_vp9), make_tuple(64, 64, sad_64x64_neon_vp9),
make_tuple(32, 32, sad_32x32_neon_vp9), make_tuple(32, 32, sad_32x32_neon_vp9),
make_tuple(16, 16, sad_16x16_neon_vp9), make_tuple(16, 16, sad_16x16_neon_vp9),
@ -490,12 +488,12 @@ INSTANTIATE_TEST_CASE_P(NEON, SADVP9Test, ::testing::ValuesIn(neon_vp9_tests));
// x86 functions // x86 functions
#if HAVE_MMX #if HAVE_MMX
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
const sad_m_by_n_fn_t sad_16x16_mmx = vp8_sad16x16_mmx; const SadMxNFunc sad_16x16_mmx = vp8_sad16x16_mmx;
const sad_m_by_n_fn_t sad_8x16_mmx = vp8_sad8x16_mmx; const SadMxNFunc sad_8x16_mmx = vp8_sad8x16_mmx;
const sad_m_by_n_fn_t sad_16x8_mmx = vp8_sad16x8_mmx; const SadMxNFunc sad_16x8_mmx = vp8_sad16x8_mmx;
const sad_m_by_n_fn_t sad_8x8_mmx = vp8_sad8x8_mmx; const SadMxNFunc sad_8x8_mmx = vp8_sad8x8_mmx;
const sad_m_by_n_fn_t sad_4x4_mmx = vp8_sad4x4_mmx; const SadMxNFunc sad_4x4_mmx = vp8_sad4x4_mmx;
const sad_m_by_n_test_param_t mmx_tests[] = { const SadMxNParam mmx_tests[] = {
make_tuple(16, 16, sad_16x16_mmx), make_tuple(16, 16, sad_16x16_mmx),
make_tuple(8, 16, sad_8x16_mmx), make_tuple(8, 16, sad_8x16_mmx),
make_tuple(16, 8, sad_16x8_mmx), make_tuple(16, 8, sad_16x8_mmx),
@ -506,12 +504,12 @@ INSTANTIATE_TEST_CASE_P(MMX, SADTest, ::testing::ValuesIn(mmx_tests));
#endif // CONFIG_VP8_ENCODER #endif // CONFIG_VP8_ENCODER
#if CONFIG_VP9_ENCODER #if CONFIG_VP9_ENCODER
const sad_m_by_n_fn_vp9_t sad_16x16_mmx_vp9 = vp9_sad16x16_mmx; const SadMxNVp9Func sad_16x16_mmx_vp9 = vp9_sad16x16_mmx;
const sad_m_by_n_fn_vp9_t sad_8x16_mmx_vp9 = vp9_sad8x16_mmx; const SadMxNVp9Func sad_8x16_mmx_vp9 = vp9_sad8x16_mmx;
const sad_m_by_n_fn_vp9_t sad_16x8_mmx_vp9 = vp9_sad16x8_mmx; const SadMxNVp9Func sad_16x8_mmx_vp9 = vp9_sad16x8_mmx;
const sad_m_by_n_fn_vp9_t sad_8x8_mmx_vp9 = vp9_sad8x8_mmx; const SadMxNVp9Func sad_8x8_mmx_vp9 = vp9_sad8x8_mmx;
const sad_m_by_n_fn_vp9_t sad_4x4_mmx_vp9 = vp9_sad4x4_mmx; const SadMxNVp9Func sad_4x4_mmx_vp9 = vp9_sad4x4_mmx;
const sad_m_by_n_test_param_vp9_t mmx_vp9_tests[] = { const SadMxNVp9Param mmx_vp9_tests[] = {
make_tuple(16, 16, sad_16x16_mmx_vp9), make_tuple(16, 16, sad_16x16_mmx_vp9),
make_tuple(8, 16, sad_8x16_mmx_vp9), make_tuple(8, 16, sad_8x16_mmx_vp9),
make_tuple(16, 8, sad_16x8_mmx_vp9), make_tuple(16, 8, sad_16x8_mmx_vp9),
@ -525,14 +523,14 @@ INSTANTIATE_TEST_CASE_P(MMX, SADVP9Test, ::testing::ValuesIn(mmx_vp9_tests));
#if HAVE_SSE #if HAVE_SSE
#if CONFIG_VP9_ENCODER #if CONFIG_VP9_ENCODER
#if CONFIG_USE_X86INC #if CONFIG_USE_X86INC
const sad_m_by_n_fn_vp9_t sad_4x4_sse_vp9 = vp9_sad4x4_sse; const SadMxNVp9Func sad_4x4_sse_vp9 = vp9_sad4x4_sse;
const sad_m_by_n_fn_vp9_t sad_4x8_sse_vp9 = vp9_sad4x8_sse; const SadMxNVp9Func sad_4x8_sse_vp9 = vp9_sad4x8_sse;
INSTANTIATE_TEST_CASE_P(SSE, SADVP9Test, ::testing::Values( INSTANTIATE_TEST_CASE_P(SSE, SADVP9Test, ::testing::Values(
make_tuple(4, 4, sad_4x4_sse_vp9), make_tuple(4, 4, sad_4x4_sse_vp9),
make_tuple(4, 8, sad_4x8_sse_vp9))); make_tuple(4, 8, sad_4x8_sse_vp9)));
const sad_n_by_n_by_4_fn_t sad_4x8x4d_sse = vp9_sad4x8x4d_sse; const SadMxNx4Func sad_4x8x4d_sse = vp9_sad4x8x4d_sse;
const sad_n_by_n_by_4_fn_t sad_4x4x4d_sse = vp9_sad4x4x4d_sse; const SadMxNx4Func sad_4x4x4d_sse = vp9_sad4x4x4d_sse;
INSTANTIATE_TEST_CASE_P(SSE, SADx4Test, ::testing::Values( INSTANTIATE_TEST_CASE_P(SSE, SADx4Test, ::testing::Values(
make_tuple(4, 8, sad_4x8x4d_sse), make_tuple(4, 8, sad_4x8x4d_sse),
make_tuple(4, 4, sad_4x4x4d_sse))); make_tuple(4, 4, sad_4x4x4d_sse)));
@ -542,12 +540,12 @@ INSTANTIATE_TEST_CASE_P(SSE, SADx4Test, ::testing::Values(
#if HAVE_SSE2 #if HAVE_SSE2
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
const sad_m_by_n_fn_t sad_16x16_wmt = vp8_sad16x16_wmt; const SadMxNFunc sad_16x16_wmt = vp8_sad16x16_wmt;
const sad_m_by_n_fn_t sad_8x16_wmt = vp8_sad8x16_wmt; const SadMxNFunc sad_8x16_wmt = vp8_sad8x16_wmt;
const sad_m_by_n_fn_t sad_16x8_wmt = vp8_sad16x8_wmt; const SadMxNFunc sad_16x8_wmt = vp8_sad16x8_wmt;
const sad_m_by_n_fn_t sad_8x8_wmt = vp8_sad8x8_wmt; const SadMxNFunc sad_8x8_wmt = vp8_sad8x8_wmt;
const sad_m_by_n_fn_t sad_4x4_wmt = vp8_sad4x4_wmt; const SadMxNFunc sad_4x4_wmt = vp8_sad4x4_wmt;
const sad_m_by_n_test_param_t sse2_tests[] = { const SadMxNParam sse2_tests[] = {
make_tuple(16, 16, sad_16x16_wmt), make_tuple(16, 16, sad_16x16_wmt),
make_tuple(8, 16, sad_8x16_wmt), make_tuple(8, 16, sad_8x16_wmt),
make_tuple(16, 8, sad_16x8_wmt), make_tuple(16, 8, sad_16x8_wmt),
@ -559,18 +557,18 @@ INSTANTIATE_TEST_CASE_P(SSE2, SADTest, ::testing::ValuesIn(sse2_tests));
#if CONFIG_VP9_ENCODER #if CONFIG_VP9_ENCODER
#if CONFIG_USE_X86INC #if CONFIG_USE_X86INC
const sad_m_by_n_fn_vp9_t sad_64x64_sse2_vp9 = vp9_sad64x64_sse2; const SadMxNVp9Func sad_64x64_sse2_vp9 = vp9_sad64x64_sse2;
const sad_m_by_n_fn_vp9_t sad_64x32_sse2_vp9 = vp9_sad64x32_sse2; const SadMxNVp9Func sad_64x32_sse2_vp9 = vp9_sad64x32_sse2;
const sad_m_by_n_fn_vp9_t sad_32x64_sse2_vp9 = vp9_sad32x64_sse2; const SadMxNVp9Func sad_32x64_sse2_vp9 = vp9_sad32x64_sse2;
const sad_m_by_n_fn_vp9_t sad_32x32_sse2_vp9 = vp9_sad32x32_sse2; const SadMxNVp9Func sad_32x32_sse2_vp9 = vp9_sad32x32_sse2;
const sad_m_by_n_fn_vp9_t sad_32x16_sse2_vp9 = vp9_sad32x16_sse2; const SadMxNVp9Func sad_32x16_sse2_vp9 = vp9_sad32x16_sse2;
const sad_m_by_n_fn_vp9_t sad_16x32_sse2_vp9 = vp9_sad16x32_sse2; const SadMxNVp9Func sad_16x32_sse2_vp9 = vp9_sad16x32_sse2;
const sad_m_by_n_fn_vp9_t sad_16x16_sse2_vp9 = vp9_sad16x16_sse2; const SadMxNVp9Func sad_16x16_sse2_vp9 = vp9_sad16x16_sse2;
const sad_m_by_n_fn_vp9_t sad_16x8_sse2_vp9 = vp9_sad16x8_sse2; const SadMxNVp9Func sad_16x8_sse2_vp9 = vp9_sad16x8_sse2;
const sad_m_by_n_fn_vp9_t sad_8x16_sse2_vp9 = vp9_sad8x16_sse2; const SadMxNVp9Func sad_8x16_sse2_vp9 = vp9_sad8x16_sse2;
const sad_m_by_n_fn_vp9_t sad_8x8_sse2_vp9 = vp9_sad8x8_sse2; const SadMxNVp9Func sad_8x8_sse2_vp9 = vp9_sad8x8_sse2;
const sad_m_by_n_fn_vp9_t sad_8x4_sse2_vp9 = vp9_sad8x4_sse2; const SadMxNVp9Func sad_8x4_sse2_vp9 = vp9_sad8x4_sse2;
const sad_m_by_n_test_param_vp9_t sse2_vp9_tests[] = { const SadMxNVp9Param sse2_vp9_tests[] = {
make_tuple(64, 64, sad_64x64_sse2_vp9), make_tuple(64, 64, sad_64x64_sse2_vp9),
make_tuple(64, 32, sad_64x32_sse2_vp9), make_tuple(64, 32, sad_64x32_sse2_vp9),
make_tuple(32, 64, sad_32x64_sse2_vp9), make_tuple(32, 64, sad_32x64_sse2_vp9),
@ -585,17 +583,17 @@ const sad_m_by_n_test_param_vp9_t sse2_vp9_tests[] = {
}; };
INSTANTIATE_TEST_CASE_P(SSE2, SADVP9Test, ::testing::ValuesIn(sse2_vp9_tests)); INSTANTIATE_TEST_CASE_P(SSE2, SADVP9Test, ::testing::ValuesIn(sse2_vp9_tests));
const sad_n_by_n_by_4_fn_t sad_64x64x4d_sse2 = vp9_sad64x64x4d_sse2; const SadMxNx4Func sad_64x64x4d_sse2 = vp9_sad64x64x4d_sse2;
const sad_n_by_n_by_4_fn_t sad_64x32x4d_sse2 = vp9_sad64x32x4d_sse2; const SadMxNx4Func sad_64x32x4d_sse2 = vp9_sad64x32x4d_sse2;
const sad_n_by_n_by_4_fn_t sad_32x64x4d_sse2 = vp9_sad32x64x4d_sse2; const SadMxNx4Func sad_32x64x4d_sse2 = vp9_sad32x64x4d_sse2;
const sad_n_by_n_by_4_fn_t sad_32x32x4d_sse2 = vp9_sad32x32x4d_sse2; const SadMxNx4Func sad_32x32x4d_sse2 = vp9_sad32x32x4d_sse2;
const sad_n_by_n_by_4_fn_t sad_32x16x4d_sse2 = vp9_sad32x16x4d_sse2; const SadMxNx4Func sad_32x16x4d_sse2 = vp9_sad32x16x4d_sse2;
const sad_n_by_n_by_4_fn_t sad_16x32x4d_sse2 = vp9_sad16x32x4d_sse2; const SadMxNx4Func sad_16x32x4d_sse2 = vp9_sad16x32x4d_sse2;
const sad_n_by_n_by_4_fn_t sad_16x16x4d_sse2 = vp9_sad16x16x4d_sse2; const SadMxNx4Func sad_16x16x4d_sse2 = vp9_sad16x16x4d_sse2;
const sad_n_by_n_by_4_fn_t sad_16x8x4d_sse2 = vp9_sad16x8x4d_sse2; const SadMxNx4Func sad_16x8x4d_sse2 = vp9_sad16x8x4d_sse2;
const sad_n_by_n_by_4_fn_t sad_8x16x4d_sse2 = vp9_sad8x16x4d_sse2; const SadMxNx4Func sad_8x16x4d_sse2 = vp9_sad8x16x4d_sse2;
const sad_n_by_n_by_4_fn_t sad_8x8x4d_sse2 = vp9_sad8x8x4d_sse2; const SadMxNx4Func sad_8x8x4d_sse2 = vp9_sad8x8x4d_sse2;
const sad_n_by_n_by_4_fn_t sad_8x4x4d_sse2 = vp9_sad8x4x4d_sse2; const SadMxNx4Func sad_8x4x4d_sse2 = vp9_sad8x4x4d_sse2;
INSTANTIATE_TEST_CASE_P(SSE2, SADx4Test, ::testing::Values( INSTANTIATE_TEST_CASE_P(SSE2, SADx4Test, ::testing::Values(
make_tuple(64, 64, sad_64x64x4d_sse2), make_tuple(64, 64, sad_64x64x4d_sse2),
make_tuple(64, 32, sad_64x32x4d_sse2), make_tuple(64, 32, sad_64x32x4d_sse2),
@ -614,11 +612,11 @@ INSTANTIATE_TEST_CASE_P(SSE2, SADx4Test, ::testing::Values(
#if HAVE_SSE3 #if HAVE_SSE3
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
const sad_n_by_n_by_4_fn_t sad_16x16x4d_sse3 = vp8_sad16x16x4d_sse3; const SadMxNx4Func sad_16x16x4d_sse3 = vp8_sad16x16x4d_sse3;
const sad_n_by_n_by_4_fn_t sad_16x8x4d_sse3 = vp8_sad16x8x4d_sse3; const SadMxNx4Func sad_16x8x4d_sse3 = vp8_sad16x8x4d_sse3;
const sad_n_by_n_by_4_fn_t sad_8x16x4d_sse3 = vp8_sad8x16x4d_sse3; const SadMxNx4Func sad_8x16x4d_sse3 = vp8_sad8x16x4d_sse3;
const sad_n_by_n_by_4_fn_t sad_8x8x4d_sse3 = vp8_sad8x8x4d_sse3; const SadMxNx4Func sad_8x8x4d_sse3 = vp8_sad8x8x4d_sse3;
const sad_n_by_n_by_4_fn_t sad_4x4x4d_sse3 = vp8_sad4x4x4d_sse3; const SadMxNx4Func sad_4x4x4d_sse3 = vp8_sad4x4x4d_sse3;
INSTANTIATE_TEST_CASE_P(SSE3, SADx4Test, ::testing::Values( INSTANTIATE_TEST_CASE_P(SSE3, SADx4Test, ::testing::Values(
make_tuple(16, 16, sad_16x16x4d_sse3), make_tuple(16, 16, sad_16x16x4d_sse3),
make_tuple(16, 8, sad_16x8x4d_sse3), make_tuple(16, 8, sad_16x8x4d_sse3),
@ -631,7 +629,7 @@ INSTANTIATE_TEST_CASE_P(SSE3, SADx4Test, ::testing::Values(
#if HAVE_SSSE3 #if HAVE_SSSE3
#if CONFIG_USE_X86INC #if CONFIG_USE_X86INC
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
const sad_m_by_n_fn_t sad_16x16_sse3 = vp8_sad16x16_sse3; const SadMxNFunc sad_16x16_sse3 = vp8_sad16x16_sse3;
INSTANTIATE_TEST_CASE_P(SSE3, SADTest, ::testing::Values( INSTANTIATE_TEST_CASE_P(SSE3, SADTest, ::testing::Values(
make_tuple(16, 16, sad_16x16_sse3))); make_tuple(16, 16, sad_16x16_sse3)));
#endif // CONFIG_VP8_ENCODER #endif // CONFIG_VP8_ENCODER
@ -650,8 +648,8 @@ void vp9_sad64x64x4d_avx2(const uint8_t *src_ptr, int src_stride,
const uint8_t *const ref_ptr[], int ref_stride, const uint8_t *const ref_ptr[], int ref_stride,
unsigned int *sad_array); unsigned int *sad_array);
} }
const sad_n_by_n_by_4_fn_t sad_64x64x4d_avx2 = vp9_sad64x64x4d_avx2; const SadMxNx4Func sad_64x64x4d_avx2 = vp9_sad64x64x4d_avx2;
const sad_n_by_n_by_4_fn_t sad_32x32x4d_avx2 = vp9_sad32x32x4d_avx2; const SadMxNx4Func sad_32x32x4d_avx2 = vp9_sad32x32x4d_avx2;
INSTANTIATE_TEST_CASE_P(DISABLED_AVX2, SADx4Test, ::testing::Values( INSTANTIATE_TEST_CASE_P(DISABLED_AVX2, SADx4Test, ::testing::Values(
make_tuple(32, 32, sad_32x32x4d_avx2), make_tuple(32, 32, sad_32x32x4d_avx2),
make_tuple(64, 64, sad_64x64x4d_avx2))); make_tuple(64, 64, sad_64x64x4d_avx2)));