From 1f00a9b9d570b410e4b5b6e292528400ff0c027f Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Fri, 13 Mar 2015 16:51:29 -0700 Subject: [PATCH] Fix choose_partitioning threshold setup for speed -5 The compression performance of speed -5 is on average 12.6% better than speed -6. At lower bit-rates, the gains are typically 20% or more. For 2-thread encoding, the speed -5 takes about 1.6x time of speed -6. Change-Id: If7a73464a24d33e8f49b9533b51ec51c8da7fc80 --- vp9/encoder/vp9_encodeframe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 724d0e761..186c6e0f4 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -481,7 +481,8 @@ static int set_vt_partitioning(VP9_COMP *cpi, void vp9_set_vbp_thresholds(VP9_COMP *cpi, int q) { SPEED_FEATURES *const sf = &cpi->sf; - if (sf->partition_search_type != VAR_BASED_PARTITION) { + if (sf->partition_search_type != VAR_BASED_PARTITION && + sf->partition_search_type != REFERENCE_PARTITION) { return; } else { VP9_COMMON *const cm = &cpi->common; @@ -3515,9 +3516,8 @@ static void encode_nonrd_sb_row(VP9_COMP *cpi, set_offsets(cpi, tile_info, x, mi_row, mi_col, BLOCK_64X64); if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cm->seg.enabled && xd->mi[0].src_mi->mbmi.segment_id) { - auto_partition_range(cpi, tile_info, xd, mi_row, mi_col, - &x->min_partition_size, - &x->max_partition_size); + x->max_partition_size = BLOCK_64X64; + x->min_partition_size = BLOCK_8X8; nonrd_pick_partition(cpi, td, tile_data, tp, mi_row, mi_col, BLOCK_64X64, &dummy_rdc, 1, INT64_MAX, td->pc_root); -- 2.40.0