commit c990ca255e8434e5b3d3f2ab28e969f0d13f4705
author Deepa K G <deepa.kg@ittiam.com> Mon Feb 22 17:11:37 2021 +0530
committer Yunqing Wang <yunqingwang@google.com> Fri Feb 26 19:00:07 2021 +0000
tree da977337b368c3014d68f8e672aaec78617d852a
parent ca44afa56bc20e717d8a4736e2c4c488ae911b75

Fix rate calculation in av1_nonrd_pick_intra_mode

In av1_nonrd_pick_intra_mode() function, the
pre-calculated value of skip_txfm_cost is used
in rate calculation instead of deriving the cost
from skip_txfm_cdfs.

STATS_CHANGED

Change-Id: I85b1397f91960f6140a42eb4622691e62523731e

av1/encoder/nonrd_pickmode.c

diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 702987c..76ce73e 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -1689,10 +1689,11 @@
     mi->tx_size = intra_tx_size;
     av1_foreach_transformed_block_in_plane(xd, bsize, 0, estimate_block_intra,
                                            &args);
+    const int skip_ctx = av1_get_skip_txfm_context(xd);
     if (args.skippable) {
-      this_rdc.rate = av1_cost_symbol(av1_get_skip_txfm_cdf(xd)[1]);
+      this_rdc.rate = x->mode_costs.skip_txfm_cost[skip_ctx][1];
     } else {
-      this_rdc.rate += av1_cost_symbol(av1_get_skip_txfm_cdf(xd)[0]);
+      this_rdc.rate += x->mode_costs.skip_txfm_cost[skip_ctx][0];
     }
     this_rdc.rate += bmode_costs[this_mode];
     this_rdc.rdcost = RDCOST(x->rdmult, this_rdc.rate, this_rdc.dist);