shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Unify the rd_mult use in rd_pick_partition"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -3707,11 +3707,7 @@

   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 };