ref: 7e272e8c4332bcb057e6aecb0d85155a73abd41a
parent: 109a2edf907678cbe9b671c8a5bac2c72fed998b
parent: c5a7c89e896f889b3a02ee2233b926b8030bcdd3
author: Johann <[email protected]>
date: Wed May 27 15:26:46 EDT 2015
Merge "Correct case in Get4x4SSEFunc"
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -32,7 +32,7 @@
typedef unsigned int (*VarianceMxNFunc)(const uint8_t *a, int a_stride,
const uint8_t *b, int b_stride,
unsigned int *sse);
-typedef unsigned int (*Get4x4SSEFunc)(const uint8_t *a, int a_stride,
+typedef unsigned int (*Get4x4SseFunc)(const uint8_t *a, int a_stride,
const uint8_t *b, int b_stride);
@@ -691,7 +691,7 @@
}
#endif // CONFIG_VP9_ENCODER
-typedef MseTest<Get4x4SSEFunc> VpxSseTest;
+typedef MseTest<Get4x4SseFunc> VpxSseTest;
typedef MseTest<VarianceMxNFunc> VpxMseTest;
typedef VarianceTest<VarianceMxNFunc> VpxVarianceTest;
@@ -709,7 +709,7 @@
INSTANTIATE_TEST_CASE_P(C, SumOfSquaresTest,
::testing::Values(vpx_get_mb_ss_c));
-const Get4x4SSEFunc get4x4sse_cs_c = vpx_get4x4sse_cs_c;
+const Get4x4SseFunc get4x4sse_cs_c = vpx_get4x4sse_cs_c;
INSTANTIATE_TEST_CASE_P(C, VpxSseTest,
::testing::Values(make_tuple(2, 2, get4x4sse_cs_c)));
@@ -1839,7 +1839,7 @@
#endif // HAVE_AVX2
#if HAVE_NEON
-const Get4x4SSEFunc get4x4sse_cs_neon = vpx_get4x4sse_cs_neon;
+const Get4x4SseFunc get4x4sse_cs_neon = vpx_get4x4sse_cs_neon;
INSTANTIATE_TEST_CASE_P(NEON, VpxSseTest,
::testing::Values(make_tuple(2, 2, get4x4sse_cs_neon)));