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/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) {