Commit c346abd3 authored by Yaowu Xu's avatar Yaowu Xu

Remove CONFIG_SHORT_FILTER

This tool is fully adopted.

Change-Id: Ibd0a8960bc624742c1deeaaf3a0fe538fd033a6e
parent 8615c257
......@@ -913,13 +913,8 @@ void av1_convolve_2d_facade(const uint8_t *src, int src_stride, uint8_t *dst,
(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 @@ void av1_highbd_convolve_2d_facade(const uint8_t *src8, int src_stride,
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
......
......@@ -63,21 +63,12 @@ typedef void (*aom_highbd_convolve_fn_t)(
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;
......
......@@ -73,8 +73,6 @@ static const InterpFilterParams
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 @@ static const InterpFilterParams av1_interp_4tap[2] = {
{ (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 @@ InterpFilterParams av1_get_interp_filter_params_with_block_size(
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]
......
......@@ -83,10 +83,8 @@ InterpFilterParams av1_get_interp_filter_params(
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) {
......
......@@ -109,7 +109,6 @@ set(CONFIG_OBU_REDUNDANT_FRAME_HEADER 0 CACHE NUMBER "AV1 experiment flag.")
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.")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment