Commit 728cdbe3 authored by Zhijie Yang's avatar Zhijie Yang Committed by Yaowu Xu

enable short_filter by default

Change-Id: I1ce575377c3d971f4488177b82c6e0b32aa5e4be
parent 5880758b
...@@ -286,9 +286,9 @@ DECLARE_ALIGNED(256, static const InterpKernel, ...@@ -286,9 +286,9 @@ DECLARE_ALIGNED(256, static const InterpKernel,
static const InterpFilterParams av1_interp_4tap[2] = { static const InterpFilterParams av1_interp_4tap[2] = {
{ (const int16_t *)sub_pel_filters_4, SUBPEL_TAPS, SUBPEL_SHIFTS, { (const int16_t *)sub_pel_filters_4, SUBPEL_TAPS, SUBPEL_SHIFTS,
FOURTAP_REGULAR }, EIGHTTAP_REGULAR },
{ (const int16_t *)sub_pel_filters_4smooth, SUBPEL_TAPS, SUBPEL_SHIFTS, { (const int16_t *)sub_pel_filters_4smooth, SUBPEL_TAPS, SUBPEL_SHIFTS,
FOURTAP_SMOOTH }, EIGHTTAP_SMOOTH },
}; };
#endif #endif
......
...@@ -44,10 +44,6 @@ typedef enum ATTRIBUTE_PACKED { ...@@ -44,10 +44,6 @@ typedef enum ATTRIBUTE_PACKED {
FILTER_SHARP_UV, FILTER_SHARP_UV,
FILTER_SMOOTH2_UV, FILTER_SMOOTH2_UV,
#endif // USE_EXTRA_FILTER #endif // USE_EXTRA_FILTER
#if CONFIG_SHORT_FILTER
FOURTAP_REGULAR,
FOURTAP_SMOOTH,
#endif
INTERP_FILTERS_ALL, INTERP_FILTERS_ALL,
SWITCHABLE_FILTERS = BILINEAR, SWITCHABLE_FILTERS = BILINEAR,
SWITCHABLE = SWITCHABLE_FILTERS + 1, /* the last switchable one */ SWITCHABLE = SWITCHABLE_FILTERS + 1, /* the last switchable one */
......
...@@ -183,7 +183,7 @@ set(CONFIG_RECT_TX_EXT 0 CACHE NUMBER "AV1 experiment flag.") ...@@ -183,7 +183,7 @@ set(CONFIG_RECT_TX_EXT 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_REFERENCE_BUFFER 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_REFERENCE_BUFFER 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_REF_ADAPT 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_REF_ADAPT 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SEGMENT_GLOBALMV 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_SEGMENT_GLOBALMV 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SHORT_FILTER 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_SHORT_FILTER 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SIMPLE_BWD_ADAPT 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_SIMPLE_BWD_ADAPT 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SIMPLIFY_TX_MODE 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_SIMPLIFY_TX_MODE 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_STRIPED_LOOP_RESTORATION 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_STRIPED_LOOP_RESTORATION 1 CACHE NUMBER "AV1 experiment flag.")
......
...@@ -522,6 +522,7 @@ post_process_cmdline() { ...@@ -522,6 +522,7 @@ post_process_cmdline() {
soft_enable palette_delta_encoding soft_enable palette_delta_encoding
soft_enable frame_size soft_enable frame_size
soft_enable segment_globalmv soft_enable segment_globalmv
soft_enable short_filter
fi fi
# Enable low-bitdepth pixel pipeline by default # Enable low-bitdepth pixel pipeline by default
......
...@@ -270,8 +270,15 @@ INSTANTIATE_TEST_CASE_P( ...@@ -270,8 +270,15 @@ INSTANTIATE_TEST_CASE_P(
TEST(AV1ConvolveTest, av1_highbd_convolve) { TEST(AV1ConvolveTest, av1_highbd_convolve) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
InterpFilters interp_filters = av1_broadcast_interp_filter(EIGHTTAP_REGULAR); InterpFilters interp_filters = av1_broadcast_interp_filter(EIGHTTAP_REGULAR);
int w = 1;
int h = 1;
#if CONFIG_SHORT_FILTER
InterpFilterParams filter_params =
av1_get_interp_filter_params_with_block_size(EIGHTTAP_REGULAR, w);
#else
InterpFilterParams filter_params = InterpFilterParams filter_params =
av1_get_interp_filter_params(EIGHTTAP_REGULAR); av1_get_interp_filter_params(EIGHTTAP_REGULAR);
#endif
int filter_size = filter_params.taps; int filter_size = filter_params.taps;
int filter_center = filter_size / 2 - 1; int filter_center = filter_size / 2 - 1;
uint16_t src[12 * 12]; uint16_t src[12 * 12];
...@@ -282,8 +289,6 @@ TEST(AV1ConvolveTest, av1_highbd_convolve) { ...@@ -282,8 +289,6 @@ TEST(AV1ConvolveTest, av1_highbd_convolve) {
int y_step_q4 = 16; int y_step_q4 = 16;
int avg = 0; int avg = 0;
int bd = 10; int bd = 10;
int w = 1;
int h = 1;
int subpel_x_q4; int subpel_x_q4;
int subpel_y_q4; int subpel_y_q4;
......
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