]> granicus.if.org Git - libvpx/commitdiff
sad_test: (arm) fix vp9-only build
authorJames Zern <jzern@google.com>
Thu, 27 Feb 2014 22:03:21 +0000 (14:03 -0800)
committerJames Zern <jzern@google.com>
Thu, 27 Feb 2014 22:03:21 +0000 (14:03 -0800)
Change-Id: I08fa0e90039186cd237001b7e43b1eabe6d326a3

test/sad_test.cc

index 9c156e0209af49905590cc604a5c8aa0f23f0f82..401fa1d257332846dc8f613e8e73ffb911a0359d 100644 (file)
@@ -371,12 +371,15 @@ INSTANTIATE_TEST_CASE_P(C, SADx4Test, ::testing::Values(
 //------------------------------------------------------------------------------
 // ARM functions
 #if HAVE_MEDIA
+#if CONFIG_VP8_ENCODER
 const sad_m_by_n_fn_t sad_16x16_armv6 = vp8_sad16x16_armv6;
 INSTANTIATE_TEST_CASE_P(MEDIA, SADTest, ::testing::Values(
                         make_tuple(16, 16, sad_16x16_armv6)));
-
 #endif
+#endif
+
 #if HAVE_NEON
+#if CONFIG_VP8_ENCODER
 const sad_m_by_n_fn_t sad_16x16_neon = vp8_sad16x16_neon;
 const sad_m_by_n_fn_t sad_8x16_neon = vp8_sad8x16_neon;
 const sad_m_by_n_fn_t sad_16x8_neon = vp8_sad16x8_neon;
@@ -389,6 +392,7 @@ INSTANTIATE_TEST_CASE_P(NEON, SADTest, ::testing::Values(
                         make_tuple(8, 8, sad_8x8_neon),
                         make_tuple(4, 4, sad_4x4_neon)));
 #endif
+#endif
 
 //------------------------------------------------------------------------------
 // x86 functions