Remove deprecated vp9 speed feature
Remove cb_partition_search feature from AV1.
Currently it is turned on only for speed 4+. But not make any
difference. Very likely vp9 style bsize range control is no longer
acting.
Also the logic for setting the range is no longer working with AV1
bsizes, since directly comparing bsize values would not work.
Change-Id: I4b9a0ee74afb855c8ccac38a1ba073aa97816d9b
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index e5bf57c..2dd9027 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -2449,59 +2449,6 @@
*max_block_size = AOMMIN(max_size, cm->seq_params.sb_size);
}
-// TODO(jingning) refactor functions setting partition search range
-static void set_partition_range(const AV1_COMMON *const cm,
- const MACROBLOCKD *const xd, int mi_row,
- int mi_col, BLOCK_SIZE bsize,
- BLOCK_SIZE *const min_bs,
- BLOCK_SIZE *const max_bs) {
- const int mi_width = mi_size_wide[bsize];
- const int mi_height = mi_size_high[bsize];
- int idx, idy;
-
- const int idx_str = cm->mi_stride * mi_row + mi_col;
- MB_MODE_INFO **const prev_mi = &cm->prev_mi_grid_visible[idx_str];
- BLOCK_SIZE min_size = cm->seq_params.sb_size; // default values
- BLOCK_SIZE max_size = BLOCK_4X4;
-
- if (prev_mi) {
- for (idy = 0; idy < mi_height; ++idy) {
- for (idx = 0; idx < mi_width; ++idx) {
- const MB_MODE_INFO *const mi = prev_mi[idy * cm->mi_stride + idx];
- const BLOCK_SIZE bs = mi ? mi->sb_type : bsize;
- min_size = AOMMIN(min_size, bs);
- max_size = AOMMAX(max_size, bs);
- }
- }
- }
-
- if (xd->left_available) {
- for (idy = 0; idy < mi_height; ++idy) {
- const MB_MODE_INFO *const mi = xd->mi[idy * cm->mi_stride - 1];
- const BLOCK_SIZE bs = mi ? mi->sb_type : bsize;
- min_size = AOMMIN(min_size, bs);
- max_size = AOMMAX(max_size, bs);
- }
- }
-
- if (xd->up_available) {
- for (idx = 0; idx < mi_width; ++idx) {
- const MB_MODE_INFO *const mi = xd->mi[idx - cm->mi_stride];
- const BLOCK_SIZE bs = mi ? mi->sb_type : bsize;
- min_size = AOMMIN(min_size, bs);
- max_size = AOMMAX(max_size, bs);
- }
- }
-
- if (min_size == max_size) {
- min_size = min_partition_size[min_size];
- max_size = max_partition_size[max_size];
- }
-
- *min_bs = AOMMIN(min_size, cm->seq_params.sb_size);
- *max_bs = AOMMIN(max_size, cm->seq_params.sb_size);
-}
-
static INLINE void store_pred_mv(MACROBLOCK *x, PICK_MODE_CONTEXT *ctx) {
memcpy(ctx->pred_mv, x->pred_mv, sizeof(x->pred_mv));
}
@@ -4077,16 +4024,6 @@
if (bsize == BLOCK_16X16 && cpi->vaq_refresh)
x->mb_energy = av1_log_block_var(cpi, x, bsize);
- if (cpi->sf.cb_partition_search && bsize == BLOCK_16X16) {
- const int cb_partition_search_ctrl =
- ((pc_tree->index == 0 || pc_tree->index == 3) +
- get_chessboard_index(cm->current_frame.frame_number)) &
- 0x1;
-
- if (cb_partition_search_ctrl && bsize > min_size && bsize < max_size)
- set_partition_range(cm, xd, mi_row, mi_col, bsize, &min_size, &max_size);
- }
-
// Determine partition types in search according to the speed features.
// The threshold set here has to be of square block size.
if (cpi->sf.auto_min_max_partition_size) {
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index c66dd6e..99e9c62 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -346,7 +346,6 @@
sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED;
sf->adaptive_pred_interp_filter = 0;
sf->adaptive_mode_search = 1;
- sf->cb_partition_search = !boosted;
sf->alt_ref_search_fp = 1;
sf->skip_sharp_interp_filter_search = 1;
sf->perform_coeff_opt = is_boosted_arf2_bwd_type ? 2 : 4;
@@ -553,7 +552,6 @@
sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED;
sf->adaptive_pred_interp_filter = 0;
sf->adaptive_mode_search = 1;
- sf->cb_partition_search = !boosted;
sf->alt_ref_search_fp = 1;
sf->skip_sharp_interp_filter_search = 1;
}
@@ -682,7 +680,6 @@
sf->adaptive_motion_search = 0;
sf->adaptive_pred_interp_filter = 0;
sf->adaptive_mode_search = 0;
- sf->cb_partition_search = 0;
sf->alt_ref_search_fp = 0;
sf->partition_search_type = SEARCH_PARTITION;
sf->tx_type_search.prune_mode = PRUNE_2D_ACCURATE;
diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h
index cfa5831..d324763 100644
--- a/av1/encoder/speed_features.h
+++ b/av1/encoder/speed_features.h
@@ -454,8 +454,6 @@
// Adaptive prediction mode search
int adaptive_mode_search;
- int cb_partition_search;
-
int alt_ref_search_fp;
// Implements various heuristics to skip searching modes
