From ee4bbe1f72eb98d8bfca4149c24137e8da6fb89c Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 16 Jul 2014 19:01:46 -0700 Subject: [PATCH] sixtap_predict_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: Ie59ddc080530d538e4ffb1d862844a84de926d92 --- test/sixtap_predict_test.cc | 54 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/test/sixtap_predict_test.cc b/test/sixtap_predict_test.cc index ac7aa9947..1e6d91547 100644 --- a/test/sixtap_predict_test.cc +++ b/test/sixtap_predict_test.cc @@ -23,17 +23,17 @@ namespace { -typedef void (*sixtap_predict_fn_t)(uint8_t *src_ptr, - int src_pixels_per_line, - int xoffset, - int yoffset, - uint8_t *dst_ptr, - int dst_pitch); +typedef void (*SixtapPredictFunc)(uint8_t *src_ptr, + int src_pixels_per_line, + int xoffset, + int yoffset, + uint8_t *dst_ptr, + int dst_pitch); -typedef std::tr1::tuple sixtap_predict_param_t; +typedef std::tr1::tuple SixtapPredictParam; class SixtapPredictTest - : public ::testing::TestWithParam { + : public ::testing::TestWithParam { public: static void SetUpTestCase() { src_ = reinterpret_cast(vpx_memalign(kDataAlignment, kSrcSize)); @@ -74,7 +74,7 @@ class SixtapPredictTest int width_; int height_; - sixtap_predict_fn_t sixtap_predict_; + SixtapPredictFunc sixtap_predict_; // The src stores the macroblock we will filter on, and makes it 1 byte larger // in order to test unaligned access. The result is stored in dst and dst_c(c // reference code result). @@ -184,10 +184,10 @@ TEST_P(SixtapPredictTest, TestWithRandomData) { using std::tr1::make_tuple; -const sixtap_predict_fn_t sixtap_16x16_c = vp8_sixtap_predict16x16_c; -const sixtap_predict_fn_t sixtap_8x8_c = vp8_sixtap_predict8x8_c; -const sixtap_predict_fn_t sixtap_8x4_c = vp8_sixtap_predict8x4_c; -const sixtap_predict_fn_t sixtap_4x4_c = vp8_sixtap_predict4x4_c; +const SixtapPredictFunc sixtap_16x16_c = vp8_sixtap_predict16x16_c; +const SixtapPredictFunc sixtap_8x8_c = vp8_sixtap_predict8x8_c; +const SixtapPredictFunc sixtap_8x4_c = vp8_sixtap_predict8x4_c; +const SixtapPredictFunc sixtap_4x4_c = vp8_sixtap_predict4x4_c; INSTANTIATE_TEST_CASE_P( C, SixtapPredictTest, ::testing::Values( make_tuple(16, 16, sixtap_16x16_c), @@ -195,9 +195,9 @@ INSTANTIATE_TEST_CASE_P( make_tuple(8, 4, sixtap_8x4_c), make_tuple(4, 4, sixtap_4x4_c))); #if HAVE_NEON -const sixtap_predict_fn_t sixtap_16x16_neon = vp8_sixtap_predict16x16_neon; -const sixtap_predict_fn_t sixtap_8x8_neon = vp8_sixtap_predict8x8_neon; -const sixtap_predict_fn_t sixtap_8x4_neon = vp8_sixtap_predict8x4_neon; +const SixtapPredictFunc sixtap_16x16_neon = vp8_sixtap_predict16x16_neon; +const SixtapPredictFunc sixtap_8x8_neon = vp8_sixtap_predict8x8_neon; +const SixtapPredictFunc sixtap_8x4_neon = vp8_sixtap_predict8x4_neon; INSTANTIATE_TEST_CASE_P( DISABLED_NEON, SixtapPredictTest, ::testing::Values( make_tuple(16, 16, sixtap_16x16_neon), @@ -205,10 +205,10 @@ INSTANTIATE_TEST_CASE_P( make_tuple(8, 4, sixtap_8x4_neon))); #endif #if HAVE_MMX -const sixtap_predict_fn_t sixtap_16x16_mmx = vp8_sixtap_predict16x16_mmx; -const sixtap_predict_fn_t sixtap_8x8_mmx = vp8_sixtap_predict8x8_mmx; -const sixtap_predict_fn_t sixtap_8x4_mmx = vp8_sixtap_predict8x4_mmx; -const sixtap_predict_fn_t sixtap_4x4_mmx = vp8_sixtap_predict4x4_mmx; +const SixtapPredictFunc sixtap_16x16_mmx = vp8_sixtap_predict16x16_mmx; +const SixtapPredictFunc sixtap_8x8_mmx = vp8_sixtap_predict8x8_mmx; +const SixtapPredictFunc sixtap_8x4_mmx = vp8_sixtap_predict8x4_mmx; +const SixtapPredictFunc sixtap_4x4_mmx = vp8_sixtap_predict4x4_mmx; INSTANTIATE_TEST_CASE_P( MMX, SixtapPredictTest, ::testing::Values( make_tuple(16, 16, sixtap_16x16_mmx), @@ -217,9 +217,9 @@ INSTANTIATE_TEST_CASE_P( make_tuple(4, 4, sixtap_4x4_mmx))); #endif #if HAVE_SSE2 -const sixtap_predict_fn_t sixtap_16x16_sse2 = vp8_sixtap_predict16x16_sse2; -const sixtap_predict_fn_t sixtap_8x8_sse2 = vp8_sixtap_predict8x8_sse2; -const sixtap_predict_fn_t sixtap_8x4_sse2 = vp8_sixtap_predict8x4_sse2; +const SixtapPredictFunc sixtap_16x16_sse2 = vp8_sixtap_predict16x16_sse2; +const SixtapPredictFunc sixtap_8x8_sse2 = vp8_sixtap_predict8x8_sse2; +const SixtapPredictFunc sixtap_8x4_sse2 = vp8_sixtap_predict8x4_sse2; INSTANTIATE_TEST_CASE_P( SSE2, SixtapPredictTest, ::testing::Values( make_tuple(16, 16, sixtap_16x16_sse2), @@ -227,10 +227,10 @@ INSTANTIATE_TEST_CASE_P( make_tuple(8, 4, sixtap_8x4_sse2))); #endif #if HAVE_SSSE3 -const sixtap_predict_fn_t sixtap_16x16_ssse3 = vp8_sixtap_predict16x16_ssse3; -const sixtap_predict_fn_t sixtap_8x8_ssse3 = vp8_sixtap_predict8x8_ssse3; -const sixtap_predict_fn_t sixtap_8x4_ssse3 = vp8_sixtap_predict8x4_ssse3; -const sixtap_predict_fn_t sixtap_4x4_ssse3 = vp8_sixtap_predict4x4_ssse3; +const SixtapPredictFunc sixtap_16x16_ssse3 = vp8_sixtap_predict16x16_ssse3; +const SixtapPredictFunc sixtap_8x8_ssse3 = vp8_sixtap_predict8x8_ssse3; +const SixtapPredictFunc sixtap_8x4_ssse3 = vp8_sixtap_predict8x4_ssse3; +const SixtapPredictFunc sixtap_4x4_ssse3 = vp8_sixtap_predict4x4_ssse3; INSTANTIATE_TEST_CASE_P( SSSE3, SixtapPredictTest, ::testing::Values( make_tuple(16, 16, sixtap_16x16_ssse3), -- 2.40.0