Remove CONFIG_SHORT_FILTER
This tool is fully adopted.
Change-Id: Ibd0a8960bc624742c1deeaaf3a0fe538fd033a6e
diff --git a/av1/common/convolve.c b/av1/common/convolve.c
index 38e7fbf..855779b 100644
--- a/av1/common/convolve.c
+++ b/av1/common/convolve.c
@@ -913,13 +913,8 @@
(void)dst_stride;
InterpFilterParams filter_params_x, filter_params_y;
-#if CONFIG_SHORT_FILTER
av1_get_convolve_filter_params(interp_filters, &filter_params_x,
&filter_params_y, w, h);
-#else
- av1_get_convolve_filter_params(interp_filters, &filter_params_x,
- &filter_params_y);
-#endif
if (scaled)
convolve_2d_scale_wrapper(src, src_stride, dst, dst_stride, w, h,
@@ -1750,13 +1745,8 @@
const uint16_t *src = CONVERT_TO_SHORTPTR(src8);
InterpFilterParams filter_params_x, filter_params_y;
-#if CONFIG_SHORT_FILTER
av1_get_convolve_filter_params(interp_filters, &filter_params_x,
&filter_params_y, w, h);
-#else
- av1_get_convolve_filter_params(interp_filters, &filter_params_x,
- &filter_params_y);
-#endif
if (scaled) {
#if CONFIG_LOWPRECISION_BLEND
diff --git a/av1/common/convolve.h b/av1/common/convolve.h
index 8174717..b388af3 100644
--- a/av1/common/convolve.h
+++ b/av1/common/convolve.h
@@ -63,21 +63,12 @@
static INLINE void av1_get_convolve_filter_params(InterpFilters interp_filters,
InterpFilterParams *params_x,
- InterpFilterParams *params_y
-#if CONFIG_SHORT_FILTER
- ,
- int w, int h
-#endif
-) {
+ InterpFilterParams *params_y,
+ int w, int h) {
InterpFilter filter_x = av1_extract_interp_filter(interp_filters, 1);
InterpFilter filter_y = av1_extract_interp_filter(interp_filters, 0);
-#if CONFIG_SHORT_FILTER
*params_x = av1_get_interp_filter_params_with_block_size(filter_x, w);
*params_y = av1_get_interp_filter_params_with_block_size(filter_y, h);
-#else
- *params_x = av1_get_interp_filter_params(filter_x);
- *params_y = av1_get_interp_filter_params(filter_y);
-#endif
}
struct AV1Common;
diff --git a/av1/common/filter.c b/av1/common/filter.c
index dddf507..dbb51e8 100644
--- a/av1/common/filter.c
+++ b/av1/common/filter.c
@@ -73,8 +73,6 @@
BILINEAR }
};
-#if CONFIG_SHORT_FILTER
-
DECLARE_ALIGNED(256, static const InterpKernel,
sub_pel_filters_4[SUBPEL_SHIFTS]) = {
{ 0, 0, 0, 128, 0, 0, 0, 0 }, { 0, 0, -4, 126, 8, -2, 0, 0 },
@@ -104,14 +102,12 @@
{ (const int16_t *)sub_pel_filters_4smooth, SUBPEL_TAPS, SUBPEL_SHIFTS,
EIGHTTAP_SMOOTH },
};
-#endif
InterpFilterParams av1_get_interp_filter_params(
const InterpFilter interp_filter) {
return av1_interp_filter_params_list[interp_filter];
}
-#if CONFIG_SHORT_FILTER
InterpFilterParams av1_get_interp_filter_params_with_block_size(
const InterpFilter interp_filter, const int w) {
if (w <= 4 &&
@@ -122,7 +118,6 @@
return av1_interp_filter_params_list[interp_filter];
}
-#endif
const int16_t *av1_get_interp_filter_kernel(const InterpFilter interp_filter) {
return (const int16_t *)av1_interp_filter_params_list[interp_filter]
diff --git a/av1/common/filter.h b/av1/common/filter.h
index b1f3b3b..661ad8e 100644
--- a/av1/common/filter.h
+++ b/av1/common/filter.h
@@ -83,10 +83,8 @@
const int16_t *av1_get_interp_filter_kernel(const InterpFilter interp_filter);
-#if CONFIG_SHORT_FILTER
InterpFilterParams av1_get_interp_filter_params_with_block_size(
const InterpFilter interp_filter, const int w);
-#endif
static INLINE const int16_t *av1_get_interp_filter_subpel_kernel(
const InterpFilterParams filter_params, const int subpel) {
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 6ba1430..6680dc0 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -109,7 +109,6 @@
set(CONFIG_OPERATING_POINTS 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_RD_DEBUG 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SCALABILITY 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_SHORT_FILTER 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SKIP_SGR 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SPATIAL_SEGMENTATION 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_TILE_INFO_FIRST 0 CACHE NUMBER "AV1 experiment flag.")
