Remove the av1_get_interp_filter_params() function We use the av1_get_interp_filter_params_with_block_size() function introduced by short filter experiment instead. Note: For motion search, we use 8-tap filter even for small blocks as before, because that seems to yield slightly better compression than using a short (4-tap) filter. This is a cleanup only: no change in output. Change-Id: Ie92a07b16f01ed3e946e972d0925568a01a1fc63
diff --git a/test/av1_convolve_2d_test_util.cc b/test/av1_convolve_2d_test_util.cc index 1c65941..84656b2 100644 --- a/test/av1_convolve_2d_test_util.cc +++ b/test/av1_convolve_2d_test_util.cc
@@ -64,9 +64,11 @@ for (vfilter = EIGHTTAP_REGULAR; vfilter < INTERP_FILTERS_ALL; ++vfilter) { InterpFilterParams filter_params_x = - av1_get_interp_filter_params((InterpFilter)hfilter); + av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter, + out_w); InterpFilterParams filter_params_y = - av1_get_interp_filter_params((InterpFilter)vfilter); + av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter, + out_h); for (int do_average = 0; do_average < 1; ++do_average) { ConvolveParams conv_params1 = get_conv_params_no_round(0, do_average, 0, NULL, 0, 0, 8); @@ -122,10 +124,6 @@ int hfilter = EIGHTTAP_REGULAR, vfilter = EIGHTTAP_REGULAR; int subx = 0, suby = 0; - InterpFilterParams filter_params_x = - av1_get_interp_filter_params((InterpFilter)hfilter); - InterpFilterParams filter_params_y = - av1_get_interp_filter_params((InterpFilter)vfilter); const int do_average = 0; ConvolveParams conv_params2 = get_conv_params_no_round(0, do_average, 0, NULL, 0, 0, 8); @@ -138,6 +136,14 @@ const int out_w = block_size_wide[block_idx] >> shift; const int out_h = block_size_high[block_idx] >> shift; const int num_loops = 1000000000 / (out_w + out_h); + + InterpFilterParams filter_params_x = + av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter, + out_w); + InterpFilterParams filter_params_y = + av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter, + out_h); + aom_usec_timer timer; aom_usec_timer_start(&timer); @@ -183,9 +189,11 @@ for (hfilter = EIGHTTAP_REGULAR; hfilter < INTERP_FILTERS_ALL; ++hfilter) { for (vfilter = EIGHTTAP_REGULAR; vfilter < INTERP_FILTERS_ALL; ++vfilter) { InterpFilterParams filter_params_x = - av1_get_interp_filter_params((InterpFilter)hfilter); + av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter, + out_w); InterpFilterParams filter_params_y = - av1_get_interp_filter_params((InterpFilter)vfilter); + av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter, + out_h); for (int do_average = 0; do_average <= 1; ++do_average) { ConvolveParams conv_params1 = get_conv_params_no_round( 0, do_average, 0, output1, MAX_SB_SIZE, 1, 8); @@ -333,11 +341,6 @@ subx = 0; suby = 0; - InterpFilterParams filter_params_x = - av1_get_interp_filter_params((InterpFilter)hfilter); - InterpFilterParams filter_params_y = - av1_get_interp_filter_params((InterpFilter)vfilter); - ConvolveParams conv_params = get_conv_params_no_round(0, do_average, 0, NULL, 0, 0, bd); @@ -351,6 +354,13 @@ const int out_h = block_size_high[block_idx] >> shift; const int num_loops = 1000000000 / (out_w + out_h); + InterpFilterParams filter_params_x = + av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter, + out_w); + InterpFilterParams filter_params_y = + av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter, + out_h); + aom_usec_timer timer; aom_usec_timer_start(&timer); for (int i = 0; i < num_loops; ++i) @@ -394,9 +404,11 @@ for (vfilter = EIGHTTAP_REGULAR; vfilter < INTERP_FILTERS_ALL; ++vfilter) { InterpFilterParams filter_params_x = - av1_get_interp_filter_params((InterpFilter)hfilter); + av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter, + out_w); InterpFilterParams filter_params_y = - av1_get_interp_filter_params((InterpFilter)vfilter); + av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter, + out_h); for (int do_average = 0; do_average < 1; ++do_average) { ConvolveParams conv_params1 = get_conv_params_no_round(0, do_average, 0, NULL, 0, 0, bd); @@ -466,9 +478,11 @@ const int out_h = block_size_high[block_idx]; InterpFilterParams filter_params_x = - av1_get_interp_filter_params((InterpFilter)hfilter); + av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter, + out_w); InterpFilterParams filter_params_y = - av1_get_interp_filter_params((InterpFilter)vfilter); + av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter, + out_h); ConvolveParams conv_params = get_conv_params_no_round(0, do_average, 0, output, MAX_SB_SIZE, 1, bd); @@ -523,9 +537,11 @@ for (hfilter = EIGHTTAP_REGULAR; hfilter < INTERP_FILTERS_ALL; ++hfilter) { for (vfilter = EIGHTTAP_REGULAR; vfilter < INTERP_FILTERS_ALL; ++vfilter) { InterpFilterParams filter_params_x = - av1_get_interp_filter_params((InterpFilter)hfilter); + av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter, + out_w); InterpFilterParams filter_params_y = - av1_get_interp_filter_params((InterpFilter)vfilter); + av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter, + out_h); for (int do_average = 0; do_average <= 1; ++do_average) { ConvolveParams conv_params1 = get_conv_params_no_round( 0, do_average, 0, output1, MAX_SB_SIZE, 1, bd);
diff --git a/test/convolve_test.cc b/test/convolve_test.cc index ef80ef1..ae4c438 100644 --- a/test/convolve_test.cc +++ b/test/convolve_test.cc
@@ -15,16 +15,16 @@ #include "./aom_config.h" #include "./aom_dsp_rtcd.h" +#include "aom_dsp/aom_dsp_common.h" +#include "aom_dsp/aom_filter.h" +#include "aom_mem/aom_mem.h" +#include "aom_ports/aom_timer.h" +#include "aom_ports/mem.h" +#include "av1/common/filter.h" #include "test/acm_random.h" #include "test/clear_system_state.h" #include "test/register_state_check.h" #include "test/util.h" -#include "aom_dsp/aom_dsp_common.h" -#include "aom_dsp/aom_filter.h" -#include "aom_mem/aom_mem.h" -#include "aom_ports/mem.h" -#include "aom_ports/aom_timer.h" -#include "av1/common/filter.h" namespace { @@ -494,7 +494,7 @@ const InterpKernel *filters = (const InterpKernel *)av1_get_interp_filter_kernel(filter); const InterpFilterParams filter_params = - av1_get_interp_filter_params(filter); + av1_get_interp_filter_params_with_block_size(filter, 8); if (filter_params.taps != SUBPEL_TAPS) continue; for (int i = 0; i < kNumFilters; i++) { const int p0 = filters[i][0] + filters[i][1]; @@ -532,7 +532,7 @@ const InterpKernel *filters = (const InterpKernel *)av1_get_interp_filter_kernel(filter); const InterpFilterParams filter_params = - av1_get_interp_filter_params(filter); + av1_get_interp_filter_params_with_block_size(filter, 8); if (filter_params.taps != SUBPEL_TAPS) continue; for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) { @@ -618,7 +618,7 @@ const InterpKernel *filters = (const InterpKernel *)av1_get_interp_filter_kernel(filter); const InterpFilterParams filter_params = - av1_get_interp_filter_params(filter); + av1_get_interp_filter_params_with_block_size(filter, 8); if (filter_params.taps != SUBPEL_TAPS) continue; for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) { for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) { @@ -717,7 +717,7 @@ const InterpKernel *filters = (const InterpKernel *)av1_get_interp_filter_kernel(filter); const InterpFilterParams filter_params = - av1_get_interp_filter_params(filter); + av1_get_interp_filter_params_with_block_size(filter, 8); if (filter_params.taps != SUBPEL_TAPS) continue; for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) {