commit 2c6ca5fe0276568de0555750c16a7cbb9a2e68d6
author Ryan Lei <ryan.z.lei@intel.com> Tue Jul 11 17:31:28 2017 -0700
committer Ryan Lei <ryan.z.lei@intel.com> Tue Jul 18 11:58:35 2017 -0700
tree 6188f632fca0abe6f290b717bb51e42bdbe68c59
parent 4fe940ad2025c313d008eb53d3f54fd6f634d9ae

enable parallel_deblocking experiment by default

this change enables parallel_deblocking by default after it has been
officially adopted. the parallel_deblocking_15taps experiment is merged
into the parallel_deblocking experiment so it is removed to clean up
the code. internal compile flags are added to disable 15 tap for both
luma and chroma plane for future experiment purpose. the internal
compile flags are disabled by default.

Change-Id: I1668fd2cb7676d756c52263d6993241618d33ee6

test/lpf_8_test.cc

diff --git a/test/lpf_8_test.cc b/test/lpf_8_test.cc
index 8d70c06..f050718 100644
--- a/test/lpf_8_test.cc
+++ b/test/lpf_8_test.cc
@@ -410,7 +410,7 @@
 
 using std::tr1::make_tuple;
 
-#if HAVE_SSE2
+#if HAVE_SSE2 && (!CONFIG_PARALLEL_DEBLOCKING)
 #if CONFIG_HIGHBITDEPTH
 
 const loop8_param_t kHbdLoop8Test6[] = {
@@ -478,7 +478,7 @@
 #endif  // CONFIG_HIGHBITDEPTH
 #endif
 
-#if HAVE_AVX2 && (!CONFIG_HIGHBITDEPTH)
+#if HAVE_AVX2 && (!CONFIG_HIGHBITDEPTH) && (!CONFIG_PARALLEL_DEBLOCKING)
 INSTANTIATE_TEST_CASE_P(
     AVX2, Loop8Test6Param,
     ::testing::Values(make_tuple(&aom_lpf_horizontal_edge_8_avx2,
@@ -487,7 +487,7 @@
                                  &aom_lpf_horizontal_edge_16_c, 8)));
 #endif
 
-#if HAVE_SSE2
+#if HAVE_SSE2 && (!CONFIG_PARALLEL_DEBLOCKING)
 #if CONFIG_HIGHBITDEPTH
 const dualloop8_param_t kHbdLoop8Test9[] = {
   make_tuple(&aom_highbd_lpf_horizontal_4_dual_sse2,
@@ -531,7 +531,7 @@
 #endif  // CONFIG_HIGHBITDEPTH
 #endif
 
-#if HAVE_NEON
+#if HAVE_NEON && (!CONFIG_PARALLEL_DEBLOCKING)
 #if CONFIG_HIGHBITDEPTH
 // No neon high bitdepth functions.
 #else
@@ -567,9 +567,9 @@
                             make_tuple(&aom_lpf_vertical_4_dual_neon,
                                        &aom_lpf_vertical_4_dual_c, 8)));
 #endif  // CONFIG_HIGHBITDEPTH
-#endif  // HAVE_NEON
+#endif  // HAVE_NEON && (!CONFIG_PARALLEL_DEBLOCKING)
 
-#if HAVE_DSPR2 && !CONFIG_HIGHBITDEPTH
+#if HAVE_DSPR2 && !CONFIG_HIGHBITDEPTH && (!CONFIG_PARALLEL_DEBLOCKING)
 INSTANTIATE_TEST_CASE_P(
     DSPR2, Loop8Test6Param,
     ::testing::Values(
@@ -593,9 +593,9 @@
                                  &aom_lpf_vertical_4_dual_c, 8),
                       make_tuple(&aom_lpf_vertical_8_dual_dspr2,
                                  &aom_lpf_vertical_8_dual_c, 8)));
-#endif  // HAVE_DSPR2 && !CONFIG_HIGHBITDEPTH
+#endif  // HAVE_DSPR2 && !CONFIG_HIGHBITDEPTH && (!CONFIG_PARALLEL_DEBLOCKING)
 
-#if HAVE_MSA && (!CONFIG_HIGHBITDEPTH)
+#if HAVE_MSA && (!CONFIG_HIGHBITDEPTH) && (!CONFIG_PARALLEL_DEBLOCKING)
 INSTANTIATE_TEST_CASE_P(
     MSA, Loop8Test6Param,
     ::testing::Values(
@@ -619,6 +619,6 @@
                                  &aom_lpf_vertical_4_dual_c, 8),
                       make_tuple(&aom_lpf_vertical_8_dual_msa,
                                  &aom_lpf_vertical_8_dual_c, 8)));
-#endif  // HAVE_MSA && (!CONFIG_HIGHBITDEPTH)
+#endif  // HAVE_MSA && (!CONFIG_HIGHBITDEPTH) && (!CONFIG_PARALLEL_DEBLOCKING)
 
 }  // namespace