commit b1372893fdbce3db0858cb201fd7340288f1d269
author Angie Chiang <angiebird@google.com> Thu Dec 01 15:06:06 2016 -0800
committer Angie Chiang <angiebird@google.com> Fri Dec 02 01:46:02 2016 +0000
tree 8e1e0fa0da9edb2c24f345d166db8a2b45138620
parent 95059afc1945ba291ae49b34aa973ebfc6f1f690

Turn on convolve_test.cc

Fix compile error.
Make it work when ext_interp/dual_filter experiments on.

Change-Id: Icba532b46856245f962c8e0c67a3159ab7d997d9

test/convolve_test.cc

diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 837b282..3c93463 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -23,6 +23,7 @@
 #include "aom_dsp/aom_filter.h"
 #include "aom_mem/aom_mem.h"
 #include "aom_ports/mem.h"
+#include "av1/common/filter.h"
 
 namespace {
 
@@ -631,13 +632,18 @@
           << "(" << x << "," << y << ")";
 }
 
-const int kNumFilterBanks = 4;
+const int kNumFilterBanks = SWITCHABLE_FILTERS;
 const int kNumFilters = 16;
 
 TEST(ConvolveTest, FiltersWontSaturateWhenAddedPairwise) {
   for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
     const InterpKernel *filters =
-        av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
+        (const InterpKernel *)av1_get_interp_filter_kernel(filter_bank);
+#if CONFIG_EXT_INTERP || CONFIG_DUAL_FILTER
+    const InterpFilterParams filter_params =
+        av1_get_interp_filter_params(filter_bank);
+    if (filter_params.taps != SUBPEL_TAPS) continue;
+#endif
     for (int i = 0; i < kNumFilters; i++) {
       const int p0 = filters[i][0] + filters[i][1];
       const int p1 = filters[i][2] + filters[i][3];
@@ -675,7 +681,12 @@
 
   for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
     const InterpKernel *filters =
-        av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
+        (const InterpKernel *)av1_get_interp_filter_kernel(filter_bank);
+#if CONFIG_EXT_INTERP || CONFIG_DUAL_FILTER
+    const InterpFilterParams filter_params =
+        av1_get_interp_filter_params(filter_bank);
+    if (filter_params.taps != SUBPEL_TAPS) continue;
+#endif
 
     for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) {
       for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) {
@@ -752,7 +763,12 @@
 
   for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
     const InterpKernel *filters =
-        av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
+        (const InterpKernel *)av1_get_interp_filter_kernel(filter_bank);
+#if CONFIG_EXT_INTERP || CONFIG_DUAL_FILTER
+    const InterpFilterParams filter_params =
+        av1_get_interp_filter_params(filter_bank);
+    if (filter_params.taps != SUBPEL_TAPS) continue;
+#endif
 
     for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) {
       for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) {
@@ -849,7 +865,12 @@
 
       for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
         const InterpKernel *filters =
-            av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
+            (const InterpKernel *)av1_get_interp_filter_kernel(filter_bank);
+#if CONFIG_EXT_INTERP || CONFIG_DUAL_FILTER
+        const InterpFilterParams filter_params =
+            av1_get_interp_filter_params(filter_bank);
+        if (filter_params.taps != SUBPEL_TAPS) continue;
+#endif
         for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) {
           for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) {
             wrapper_filter_block2d_8_c(in, kInputStride, filters[filter_x],
@@ -891,7 +912,8 @@
 TEST_P(ConvolveTest, CheckScalingFiltering) {
   uint8_t *const in = input();
   uint8_t *const out = output();
-  const InterpKernel *const eighttap = av1_filter_kernels[EIGHTTAP];
+  const InterpKernel *const eighttap =
+      (const InterpKernel *)av1_get_interp_filter_kernel(EIGHTTAP_REGULAR);
 
   SetConstantInput(127);
 

test/test.mk

diff --git a/test/test.mk b/test/test.mk
index 2d18f69..d6eefaf 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -114,7 +114,7 @@
 endif
 
 LIBAOM_TEST_SRCS-$(CONFIG_ADAPT_SCAN)  += scan_test.cc
-#LIBAOM_TEST_SRCS-yes                   += convolve_test.cc
+LIBAOM_TEST_SRCS-yes                   += convolve_test.cc
 LIBAOM_TEST_SRCS-yes                   += lpf_8_test.cc
 LIBAOM_TEST_SRCS-$(CONFIG_CLPF)        += clpf_test.cc
 LIBAOM_TEST_SRCS-yes                   += intrapred_test.cc