libvpx: Pull from upstream

source/libvpx/test/variance_test.cc

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1088 matching lines @@
                       make_tuple(5, 5, highbd_8_variance32x32_sse2, 8),
                       make_tuple(5, 4, highbd_8_variance32x16_sse2, 8),
                       make_tuple(4, 5, highbd_8_variance16x32_sse2, 8),
                       make_tuple(4, 4, highbd_8_variance16x16_sse2, 8),
                       make_tuple(4, 3, highbd_8_variance16x8_sse2, 8),
                       make_tuple(3, 4, highbd_8_variance8x16_sse2, 8),
                       make_tuple(3, 3, highbd_8_variance8x8_sse2, 8)));
 #endif  // CONFIG_VP9_HIGHBITDEPTH
 #endif  // HAVE_SSE2
 
-#if CONFIG_VP8
+#if CONFIG_VP8_ENCODER
 typedef SubpelVarianceTest<SubpixVarMxNFunc> VP8SubpelVarianceTest;
 
 TEST_P(VP8SubpelVarianceTest, Ref) { RefTest(); }
 TEST_P(VP8SubpelVarianceTest, ExtremeRef) { ExtremeRefTest(); }
-#endif  // CONFIG_VP8
+#endif  // CONFIG_VP8_ENCODER
 
 #if CONFIG_VP9_ENCODER
 typedef SubpelVarianceTest<SubpixVarMxNFunc> VP9SubpelVarianceTest;
 typedef SubpelVarianceTest<vp9_subp_avg_variance_fn_t> VP9SubpelAvgVarianceTest;
 
 TEST_P(VP9SubpelVarianceTest, Ref) { RefTest(); }
 TEST_P(VP9SubpelVarianceTest, ExtremeRef) { ExtremeRefTest(); }
 TEST_P(VP9SubpelAvgVarianceTest, Ref) { RefTest(); }
 
 #if CONFIG_VP9_HIGHBITDEPTH
@@ skipping 28 matching lines @@
                       make_tuple(3, 4, subpel_variance8x16_c, 0),
                       make_tuple(4, 3, subpel_variance16x8_c, 0),
                       make_tuple(4, 4, subpel_variance16x16_c, 0),
                       make_tuple(4, 5, subpel_variance16x32_c, 0),
                       make_tuple(5, 4, subpel_variance32x16_c, 0),
                       make_tuple(5, 5, subpel_variance32x32_c, 0),
                       make_tuple(5, 6, subpel_variance32x64_c, 0),
                       make_tuple(6, 5, subpel_variance64x32_c, 0),
                       make_tuple(6, 6, subpel_variance64x64_c, 0)));
 
-#if CONFIG_VP8
+#if CONFIG_VP8_ENCODER
 const SubpixVarMxNFunc vp8_subpel_variance16x16_c =
     vp8_sub_pixel_variance16x16_c;
 const SubpixVarMxNFunc vp8_subpel_variance16x8_c = vp8_sub_pixel_variance16x8_c;
 const SubpixVarMxNFunc vp8_subpel_variance8x16_c = vp8_sub_pixel_variance8x16_c;
 const SubpixVarMxNFunc vp8_subpel_variance8x8_c = vp8_sub_pixel_variance8x8_c;
 const SubpixVarMxNFunc vp8_subpel_variance4x4_c = vp8_sub_pixel_variance4x4_c;
 INSTANTIATE_TEST_CASE_P(
     C, VP8SubpelVarianceTest,
     ::testing::Values(make_tuple(2, 2, vp8_subpel_variance4x4_c, 0),
                       make_tuple(3, 3, vp8_subpel_variance8x8_c, 0),
                       make_tuple(3, 4, vp8_subpel_variance8x16_c, 0),
                       make_tuple(4, 3, vp8_subpel_variance16x8_c, 0),
                       make_tuple(4, 4, vp8_subpel_variance16x16_c, 0)));
-#endif  // CONFIG_VP8
+#endif  // CONFIG_VP8_ENCODER
 
 const vp9_subp_avg_variance_fn_t subpel_avg_variance4x4_c =
     vp9_sub_pixel_avg_variance4x4_c;
 const vp9_subp_avg_variance_fn_t subpel_avg_variance4x8_c =
     vp9_sub_pixel_avg_variance4x8_c;
 const vp9_subp_avg_variance_fn_t subpel_avg_variance8x4_c =
     vp9_sub_pixel_avg_variance8x4_c;
 const vp9_subp_avg_variance_fn_t subpel_avg_variance8x8_c =
     vp9_sub_pixel_avg_variance8x8_c;
 const vp9_subp_avg_variance_fn_t subpel_avg_variance8x16_c =
@@ skipping 265 matching lines @@
         make_tuple(4, 4, highbd_subpel_avg_variance16x16_c, 8),
         make_tuple(4, 5, highbd_subpel_avg_variance16x32_c, 8),
         make_tuple(5, 4, highbd_subpel_avg_variance32x16_c, 8),
         make_tuple(5, 5, highbd_subpel_avg_variance32x32_c, 8),
         make_tuple(5, 6, highbd_subpel_avg_variance32x64_c, 8),
         make_tuple(6, 5, highbd_subpel_avg_variance64x32_c, 8),
         make_tuple(6, 6, highbd_subpel_avg_variance64x64_c, 8)));
 #endif  // CONFIG_VP9_HIGHBITDEPTH
 #endif  // CONFIG_VP9_ENCODER
 
-#if CONFIG_VP8
+#if CONFIG_VP8_ENCODER
 #if HAVE_MMX
 const SubpixVarMxNFunc subpel_variance16x16_mmx =
     vp8_sub_pixel_variance16x16_mmx;
 const SubpixVarMxNFunc subpel_variance16x8_mmx = vp8_sub_pixel_variance16x8_mmx;
 const SubpixVarMxNFunc subpel_variance8x16_mmx = vp8_sub_pixel_variance8x16_mmx;
 const SubpixVarMxNFunc subpel_variance8x8_mmx = vp8_sub_pixel_variance8x8_mmx;
 const SubpixVarMxNFunc subpel_variance4x4_mmx = vp8_sub_pixel_variance4x4_mmx;
 INSTANTIATE_TEST_CASE_P(
     MMX, VP8SubpelVarianceTest,
     ::testing::Values(make_tuple(4, 4, subpel_variance16x16_mmx, 0),
                       make_tuple(4, 3, subpel_variance16x8_mmx, 0),
                       make_tuple(3, 4, subpel_variance8x16_mmx, 0),
                       make_tuple(3, 3, subpel_variance8x8_mmx, 0),
                       make_tuple(2, 2, subpel_variance4x4_mmx, 0)));
 #endif  // HAVE_MMX
-#endif  // CONFIG_VP8
+#endif  // CONFIG_VP8_ENCODER
 
 #if CONFIG_VP9_ENCODER
 #if HAVE_SSE2
 #if CONFIG_USE_X86INC
 const SubpixVarMxNFunc subpel_variance4x4_sse = vp9_sub_pixel_variance4x4_sse;
 const SubpixVarMxNFunc subpel_variance4x8_sse = vp9_sub_pixel_variance4x8_sse;
 const SubpixVarMxNFunc subpel_variance8x4_sse2 = vp9_sub_pixel_variance8x4_sse2;
 const SubpixVarMxNFunc subpel_variance8x8_sse2 = vp9_sub_pixel_variance8x8_sse2;
 const SubpixVarMxNFunc subpel_variance8x16_sse2 =
     vp9_sub_pixel_variance8x16_sse2;
@@ skipping 271 matching lines @@
                   make_tuple(5, 4, highbd_subpel_avg_variance32x16_sse2, 8),
                   make_tuple(5, 5, highbd_subpel_avg_variance32x32_sse2, 8),
                   make_tuple(5, 6, highbd_subpel_avg_variance32x64_sse2, 8),
                   make_tuple(6, 5, highbd_subpel_avg_variance64x32_sse2, 8),
                   make_tuple(6, 6, highbd_subpel_avg_variance64x64_sse2, 8)));
 #endif  // CONFIG_VP9_HIGHBITDEPTH
 #endif  // CONFIG_USE_X86INC
 #endif  // HAVE_SSE2
 #endif  // CONFIG_VP9_ENCODER
 
-#if CONFIG_VP8
+#if CONFIG_VP8_ENCODER
 #if HAVE_SSE2
 const SubpixVarMxNFunc vp8_subpel_variance16x16_sse2 =
     vp8_sub_pixel_variance16x16_wmt;
 const SubpixVarMxNFunc vp8_subpel_variance16x8_sse2 =
     vp8_sub_pixel_variance16x8_wmt;
 const SubpixVarMxNFunc vp8_subpel_variance8x16_sse2 =
     vp8_sub_pixel_variance8x16_wmt;
 const SubpixVarMxNFunc vp8_subpel_variance8x8_sse2 =
     vp8_sub_pixel_variance8x8_wmt;
 const SubpixVarMxNFunc vp8_subpel_variance4x4_sse2 =
     vp8_sub_pixel_variance4x4_wmt;
 INSTANTIATE_TEST_CASE_P(
     SSE2, VP8SubpelVarianceTest,
     ::testing::Values(make_tuple(2, 2, vp8_subpel_variance4x4_sse2, 0),
                       make_tuple(3, 3, vp8_subpel_variance8x8_sse2, 0),
                       make_tuple(3, 4, vp8_subpel_variance8x16_sse2, 0),
                       make_tuple(4, 3, vp8_subpel_variance16x8_sse2, 0),
                       make_tuple(4, 4, vp8_subpel_variance16x16_sse2, 0)));
 #endif  // HAVE_SSE2
-#endif  // CONFIG_VP8
+#endif  // CONFIG_VP8_ENCODER
 
 #if CONFIG_VP9_ENCODER
 #if HAVE_SSSE3
 #if CONFIG_USE_X86INC
 const SubpixVarMxNFunc subpel_variance4x4_ssse3 =
     vp9_sub_pixel_variance4x4_ssse3;
 const SubpixVarMxNFunc subpel_variance4x8_ssse3 =
     vp9_sub_pixel_variance4x8_ssse3;
 const SubpixVarMxNFunc subpel_variance8x4_ssse3 =
     vp9_sub_pixel_variance8x4_ssse3;
@@ skipping 70 matching lines @@
                       make_tuple(4, 5, subpel_avg_variance16x32_ssse3, 0),
                       make_tuple(5, 4, subpel_avg_variance32x16_ssse3, 0),
                       make_tuple(5, 5, subpel_avg_variance32x32_ssse3, 0),
                       make_tuple(5, 6, subpel_avg_variance32x64_ssse3, 0),
                       make_tuple(6, 5, subpel_avg_variance64x32_ssse3, 0),
                       make_tuple(6, 6, subpel_avg_variance64x64_ssse3, 0)));
 #endif  // CONFIG_USE_X86INC
 #endif  // HAVE_SSSE3
 #endif  // CONFIG_VP9_ENCODER
 
-#if CONFIG_VP8
+#if CONFIG_VP8_ENCODER
 #if HAVE_SSSE3
 const SubpixVarMxNFunc vp8_subpel_variance16x16_ssse3 =
     vp8_sub_pixel_variance16x16_ssse3;
 const SubpixVarMxNFunc vp8_subpel_variance16x8_ssse3 =
     vp8_sub_pixel_variance16x8_ssse3;
 INSTANTIATE_TEST_CASE_P(
     SSSE3, VP8SubpelVarianceTest,
     ::testing::Values(make_tuple(4, 3, vp8_subpel_variance16x8_ssse3, 0),
                       make_tuple(4, 4, vp8_subpel_variance16x16_ssse3, 0)));
 #endif  // HAVE_SSSE3
-#endif  // CONFIG_VP8
+#endif  // CONFIG_VP8_ENCODER
 
 #if HAVE_AVX2
 const VarianceMxNFunc mse16x16_avx2 = vpx_mse16x16_avx2;
 INSTANTIATE_TEST_CASE_P(AVX2, VpxMseTest,
                         ::testing::Values(make_tuple(4, 4, mse16x16_avx2)));
 
 const VarianceMxNFunc variance64x64_avx2 = vpx_variance64x64_avx2;
 const VarianceMxNFunc variance64x32_avx2 = vpx_variance64x32_avx2;
 const VarianceMxNFunc variance32x32_avx2 = vpx_variance32x32_avx2;
 const VarianceMxNFunc variance32x16_avx2 = vpx_variance32x16_avx2;
@@ skipping 20 matching lines @@
     vp9_sub_pixel_avg_variance32x32_avx2;
 const vp9_subp_avg_variance_fn_t subpel_avg_variance64x64_avx2 =
     vp9_sub_pixel_avg_variance64x64_avx2;
 INSTANTIATE_TEST_CASE_P(
     AVX2, VP9SubpelAvgVarianceTest,
     ::testing::Values(make_tuple(5, 5, subpel_avg_variance32x32_avx2, 0),
                       make_tuple(6, 6, subpel_avg_variance64x64_avx2, 0)));
 #endif  // CONFIG_VP9_ENCODER
 #endif  // HAVE_AVX2
 
-#if CONFIG_VP8
+#if CONFIG_VP8_ENCODER
 #if HAVE_MEDIA
 const SubpixVarMxNFunc subpel_variance16x16_media =
     vp8_sub_pixel_variance16x16_armv6;
 const SubpixVarMxNFunc subpel_variance8x8_media =
     vp8_sub_pixel_variance8x8_armv6;
 INSTANTIATE_TEST_CASE_P(
     MEDIA, VP8SubpelVarianceTest,
     ::testing::Values(make_tuple(3, 3, subpel_variance8x8_media, 0),
                       make_tuple(4, 4, subpel_variance16x16_media, 0)));
 #endif  // HAVE_MEDIA
-#endif  // CONFIG_VP8
+#endif  // CONFIG_VP8_ENCODER
 
 #if HAVE_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)));
 
 const VarianceMxNFunc mse16x16_neon = vpx_mse16x16_neon;
 INSTANTIATE_TEST_CASE_P(NEON, VpxMseTest,
                         ::testing::Values(make_tuple(4, 4, mse16x16_neon)));
 
 const VarianceMxNFunc variance64x64_neon = vpx_variance64x64_neon;
 const VarianceMxNFunc variance64x32_neon = vpx_variance64x32_neon;
 const VarianceMxNFunc variance32x64_neon = vpx_variance32x64_neon;
 const VarianceMxNFunc variance32x32_neon = vpx_variance32x32_neon;
 const VarianceMxNFunc variance16x16_neon = vpx_variance16x16_neon;
 const VarianceMxNFunc variance16x8_neon = vpx_variance16x8_neon;
 const VarianceMxNFunc variance8x16_neon = vpx_variance8x16_neon;
 const VarianceMxNFunc variance8x8_neon = vpx_variance8x8_neon;
 INSTANTIATE_TEST_CASE_P(
     NEON, VpxVarianceTest,
     ::testing::Values(make_tuple(6, 6, variance64x64_neon, 0),
                       make_tuple(6, 5, variance64x32_neon, 0),
                       make_tuple(5, 6, variance32x64_neon, 0),
                       make_tuple(5, 5, variance32x32_neon, 0),
                       make_tuple(4, 4, variance16x16_neon, 0),
                       make_tuple(4, 3, variance16x8_neon, 0),
                       make_tuple(3, 4, variance8x16_neon, 0),
                       make_tuple(3, 3, variance8x8_neon, 0)));
 
-#if CONFIG_VP8
+#if CONFIG_VP8_ENCODER
 #if HAVE_NEON_ASM
 const SubpixVarMxNFunc vp8_subpel_variance16x16_neon =
     vp8_sub_pixel_variance16x16_neon;
 INSTANTIATE_TEST_CASE_P(
     NEON, VP8SubpelVarianceTest,
     ::testing::Values(make_tuple(4, 4, vp8_subpel_variance16x16_neon, 0)));
 #endif  // HAVE_NEON_ASM
-#endif  // CONFIG_VP8
+#endif  // CONFIG_VP8_ENCODER
 
 #if CONFIG_VP9_ENCODER
 const SubpixVarMxNFunc subpel_variance8x8_neon = vp9_sub_pixel_variance8x8_neon;
 const SubpixVarMxNFunc subpel_variance16x16_neon =
     vp9_sub_pixel_variance16x16_neon;
 const SubpixVarMxNFunc subpel_variance32x32_neon =
     vp9_sub_pixel_variance32x32_neon;
 const SubpixVarMxNFunc subpel_variance64x64_neon =
     vp9_sub_pixel_variance64x64_neon;
 INSTANTIATE_TEST_CASE_P(
@@ skipping 11 matching lines @@
                         ::testing::Values(make_tuple(4, 4, mse16x16_media)));
 
 const VarianceMxNFunc variance16x16_media = vpx_variance16x16_media;
 const VarianceMxNFunc variance8x8_media = vpx_variance8x8_media;
 INSTANTIATE_TEST_CASE_P(
     MEDIA, VpxVarianceTest,
     ::testing::Values(make_tuple(4, 4, variance16x16_media, 0),
                       make_tuple(3, 3, variance8x8_media, 0)));
 #endif  // HAVE_MEDIA
 }  // namespace