From 813cd2649528966a6d098c0a94e7c48907fc3591 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Fri, 15 Mar 2019 16:23:43 -0700 Subject: [PATCH] Unify the rd_mult use in rd_pick_partition Abstract the control outside rd_pick_partition function. No need to switch between x->cb_rdmult and the cpi->rd.RDMULT here. Change-Id: Ia3104ebe15b5e59a4f29ffe6e8c7d718ecb998a8 --- vp9/encoder/vp9_encodeframe.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 414551a..7c9bdfc 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3705,11 +3705,7 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td, int64_t dist_breakout_thr = cpi->sf.partition_search_breakout_thr.dist; int rate_breakout_thr = cpi->sf.partition_search_breakout_thr.rate; int must_split = 0; - int partition_mul = - (cpi->sf.enable_tpl_model || cpi->sf.enable_wiener_variance) && - cpi->oxcf.aq_mode == NO_AQ - ? x->cb_rdmult - : cpi->rd.RDMULT; + int partition_mul = x->cb_rdmult; // Ref frames picked in the [i_th] quarter subblock during square partition // RD search. It may be used to prune ref frame selection of rect partitions. uint8_t ref_frames_used[4] = { 0, 0, 0, 0 }; -- 2.7.4