Remove CONFIG_REDUCED_ENCODER_BORDER
A similar implementation has been done by defining
AOM_ENC_NO_SCALE_BORDER. Therefore, this config is
not needed anymore.
Change-Id: I1e7ac5aadd52edf8f33e668bb2cd3cc00ac84a12
diff --git a/aom_scale/yv12config.h b/aom_scale/yv12config.h
index 28147206..bb0d564 100644
--- a/aom_scale/yv12config.h
+++ b/aom_scale/yv12config.h
@@ -24,15 +24,7 @@
#define AOMINNERBORDERINPIXELS 160
#define AOM_INTERP_EXTEND 4
-
-// TODO(jingning): Use unified inter predictor for encoder and
-// decoder during the development process. Revisit the frame border
-// to improve the decoder performance.
-#if CONFIG_REDUCED_ENCODER_BORDER
-#define AOM_BORDER_IN_PIXELS 160
-#else
#define AOM_BORDER_IN_PIXELS 288
-#endif // CONFIG_REDUCED_ENCODER_BORDER
#define AOM_ENC_NO_SCALE_BORDER 160
#define AOM_DEC_BORDER_IN_PIXELS 64
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 26d4319..8cae11e 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -26,10 +26,6 @@
#include "av1/encoder/encoder.h"
#include "av1/encoder/firstpass.h"
-#if CONFIG_REDUCED_ENCODER_BORDER
-#include "common/tools_common.h"
-#endif // CONFIG_REDUCED_ENCODER_BORDER
-
#define MAG_SIZE (4)
#define MAX_NUM_ENHANCEMENT_LAYERS 3
@@ -777,20 +773,6 @@
oxcf->frame_periodic_boost = extra_cfg->frame_periodic_boost;
oxcf->motion_vector_unit_test = extra_cfg->motion_vector_unit_test;
-#if CONFIG_REDUCED_ENCODER_BORDER
- if (oxcf->superres_mode != SUPERRES_NONE ||
- oxcf->resize_mode != RESIZE_NONE) {
- warn(
- "Superres / resize cannot be used with CONFIG_REDUCED_ENCODER_BORDER. "
- "Disabling superres/resize.\n");
- // return AOM_CODEC_INVALID_PARAM;
- disable_superres(oxcf);
- oxcf->resize_mode = RESIZE_NONE;
- oxcf->resize_scale_denominator = SCALE_NUMERATOR;
- oxcf->resize_kf_scale_denominator = SCALE_NUMERATOR;
- }
-#endif // CONFIG_REDUCED_ENCODER_BORDER
-
oxcf->chroma_subsampling_x = extra_cfg->chroma_subsampling_x;
oxcf->chroma_subsampling_y = extra_cfg->chroma_subsampling_y;
oxcf->border_in_pixels = (oxcf->resize_mode || oxcf->superres_mode)
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index db0c9b9..9fb7113 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -112,11 +112,6 @@
"Max profile to support decoding.")
set_aom_config_var(CONFIG_NORMAL_TILE_MODE 0 NUMBER
"Only enables normal tile mode.")
-set_aom_config_var(
- CONFIG_REDUCED_ENCODER_BORDER 0 NUMBER
- "Enable reduced border extention for encoder. \
- Disables superres and resize support."
- )
set_aom_config_var(CONFIG_SIZE_LIMIT 0 NUMBER "Limit max decode width/height.")
set_aom_config_var(CONFIG_SPATIAL_RESAMPLING 1 NUMBER "Spatial resampling.")
set_aom_config_var(DECODE_HEIGHT_LIMIT 0 NUMBER "Set limit for decode height.")
