Commit 250dd963 authored by Yue Chen's avatar Yue Chen

Clean-up abandoned options for filter_intra

Code for the following options is removed.
(1) Disable filter_intra in sub8x8 tx blocks
(2) Filter intra implementaion based on 1x1, 2x2, and 4x4 unit

Change-Id: Ie898f6e8155709beff030b0ffb876754f14fb173
parent 467205ac
......@@ -969,27 +969,10 @@ static const uint8_t mode_to_angle_map[] = {
#endif // CONFIG_EXT_INTRA
#if CONFIG_FILTER_INTRA
#define DISABLE_SUB8X8_FILTER_INTRA 0
static INLINE int av1_filter_intra_allowed_bsize(BLOCK_SIZE bs) {
(void)bs;
#if DISABLE_SUB8X8_FILTER_INTRA
return block_size_wide[bs] >= 8 && block_size_high[bs] >= 8;
#else
return 1;
#endif
}
static INLINE int av1_filter_intra_allowed_txsize(TX_SIZE tx) {
(void)tx;
if (tx == TX_INVALID) return 0;
#if DISABLE_SUB8X8_FILTER_INTRA
return tx_size_wide[tx] >= 8 && tx_size_high[tx] >= 8 &&
tx_size_wide[tx] <= 32 && tx_size_high[tx] <= 32;
#else
return tx_size_wide[tx] <= 32 && tx_size_high[tx] <= 32;
#endif
}
static INLINE TX_SIZE av1_max_tx_size_for_filter_intra(BLOCK_SIZE bsize,
......
This diff is collapsed.
......@@ -42,14 +42,7 @@ static const INTERINTRA_MODE intra_to_interintra_mode[INTRA_MODES] = {
};
#if CONFIG_FILTER_INTRA
#define FILTER_INTRA_PROC_UNIT_SIZE 42 // ij means a i(cols)xj(rows) unit
#if FILTER_INTRA_PROC_UNIT_SIZE == 44
#define FILTER_INTRA_SCALE_BITS 5
#elif FILTER_INTRA_PROC_UNIT_SIZE == 42
#define FILTER_INTRA_SCALE_BITS 4
#else
#define FILTER_INTRA_SCALE_BITS 3
#endif
#endif // CONFIG_FILTER_INTRA
#define CONFIG_INTRA_EDGE_UPSAMPLE CONFIG_INTRA_EDGE
......
......@@ -3546,8 +3546,7 @@ static int64_t rd_pick_intra_sby_mode(const AV1_COMP *const cpi, MACROBLOCK *x,
}
#if CONFIG_FILTER_INTRA
if (beat_best_rd && av1_filter_intra_allowed_bsize(bsize) &&
!xd->lossless[mbmi->segment_id]) {
if (beat_best_rd && !xd->lossless[mbmi->segment_id]) {
if (rd_pick_filter_intra_sby(cpi, x, rate, rate_tokenonly, distortion,
skippable, bsize, bmode_costs[DC_PRED],
&best_rd, &best_model_rd)) {
......@@ -9818,8 +9817,7 @@ void av1_rd_pick_inter_mode_sb(const AV1_COMP *cpi, TileDataEnc *tile_data,
skippable = rd_stats_y.skip;
#if CONFIG_FILTER_INTRA
if (mbmi->mode == DC_PRED && !xd->lossless[mbmi->segment_id] &&
av1_filter_intra_allowed_bsize(mbmi->sb_type)) {
if (mbmi->mode == DC_PRED && !xd->lossless[mbmi->segment_id]) {
RD_STATS rd_stats_y_fi;
int filter_intra_selected_flag = 0;
TX_SIZE best_tx_size = mbmi->tx_size;
......
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