commit 0fda6a40d5944f624af24b83b0aaf26b3d53d35b
author Jingning Han <jingning@google.com> Wed Apr 21 13:21:22 2021 -0700
committer Jingning Han <jingning@google.com> Thu Apr 22 04:27:14 2021 +0000
tree e75e2fcd8cfe33d917fb7f56a6fc85253aeb0e87
parent e57ea654846afd1349eb46a408fca8592f834fb0

Simplify shift calculation in optimize_b

Simplify the shift step calculation in optimize_b by skipping the
check on conditions that won't go through soft quantization stage.

Change-Id: I99d244fef7527156458fa0604d77e13019a34459

av1/encoder/txb_rdopt.c

diff --git a/av1/encoder/txb_rdopt.c b/av1/encoder/txb_rdopt.c
index 31b86ab..884d0a9 100644
--- a/av1/encoder/txb_rdopt.c
+++ b/av1/encoder/txb_rdopt.c
@@ -327,16 +327,8 @@
   const LV_MAP_EOB_COST *txb_eob_costs =
       &coeff_costs->eob_costs[eob_multi_size][plane_type];
 
-  const int rshift =
-      (sharpness +
-       (cpi->oxcf.q_cfg.aq_mode == VARIANCE_AQ && mbmi->segment_id < 4
-            ? 7 - mbmi->segment_id
-            : 2) +
-       (cpi->oxcf.q_cfg.aq_mode != VARIANCE_AQ &&
-                cpi->oxcf.q_cfg.deltaq_mode == DELTA_Q_PERCEPTUAL &&
-                cm->delta_q_info.delta_q_present_flag && x->sb_energy_level < 0
-            ? (3 - x->sb_energy_level)
-            : 0));
+  const int rshift = sharpness + 2;
+
   const int64_t rdmult =
       (((int64_t)x->rdmult *
         (plane_rd_mult[is_inter][plane_type] << (2 * (xd->bd - 8)))) +