Commit 6f5a1e03 authored by Yaowu Xu's avatar Yaowu Xu
Browse files

Increase redo_frequency to 4 and cleanups

Clean-ups include
a. redundant code in rt -5 speed feature settings
b. code that guarantees square block availability in
rd_auto_partition_range()

Change-Id: Ic7b04d45b6dc15c461e0edbbb4e78aec20348291
parent 1f08824d
......@@ -1644,8 +1644,8 @@ static void rd_auto_partition_range(VP9_COMP *cpi, const TileInfo *const tile,
// partition is allowed by selecting the next smaller square size as
// *min_block_size.
if (cpi->sf.use_square_partition_only &&
(*max_block_size - *min_block_size) < 2) {
*min_block_size = next_square_size[*min_block_size];
next_square_size[*max_block_size] < *min_block_size) {
*min_block_size = next_square_size[*max_block_size];
}
}
......
......@@ -840,14 +840,12 @@ static void set_rt_speed_feature(VP9_COMMON *cm,
}
if (speed >= 5) {
int i;
sf->mode_search_skip_flags |= FLAG_SKIP_COMP_REFMISMATCH |
FLAG_EARLY_TERMINATE;
sf->use_fast_coef_costing = 0;
sf->last_partitioning_redo_frequency = 4;
sf->adaptive_rd_thresh = 5;
sf->auto_min_max_partition_size = frame_is_intra_only(cm) ?
RELAXED_NEIGHBORING_MIN_MAX : STRICT_NEIGHBORING_MIN_MAX;
sf->use_fast_coef_costing = 0;
sf->auto_min_max_partition_size = STRICT_NEIGHBORING_MIN_MAX;
sf->adjust_partitioning_from_last_frame =
cm->last_frame_type == KEY_FRAME || (0 ==
cm->last_frame_type != cm->frame_type || (0 ==
(cm->current_video_frame + 1) % sf->last_partitioning_redo_frequency);
sf->subpel_force_stop = 1;
for (i = 0; i < TX_SIZES; i++) {
......
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