commit 4639e080603abaebd3b6a9cf018ab7589d07497a
author Angie Chiang <angiebird@google.com> Thu Nov 30 15:35:45 2017 -0800
committer Angie Chiang <angiebird@google.com> Sat Dec 02 00:42:42 2017 +0000
tree f5131ed01fb7185419d091c599be8891074d8e82
parent 1dafecd6d1ca05a8ba1e7885b2c2d2dc109ec21a

Correct the skip rate in set_skip_flag for lv_map

Change-Id: I584694374a2468e0dcfe6e4fdb2582e5cae051ef

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index b6d70a2..1508454 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4751,8 +4751,16 @@
   ENTROPY_CONTEXT ctxa[2 * MAX_MIB_SIZE];
   ENTROPY_CONTEXT ctxl[2 * MAX_MIB_SIZE];
   av1_get_entropy_contexts(bsize, 0, &xd->plane[0], ctxa, ctxl);
+#if CONFIG_LV_MAP
+  TXB_CTX txb_ctx;
+  // Because plane is 0, plane_bsize equal to bsize
+  get_txb_ctx(bsize, tx_size, 0, ctxa, ctxl, &txb_ctx);
+  int rate = x->coeff_costs[tx_size_ctx][PLANE_TYPE_Y]
+                 .txb_skip_cost[txb_ctx.txb_skip_ctx][1];
+#else
   int coeff_ctx = get_entropy_context(tx_size, ctxa, ctxl);
   int rate = x->token_head_costs[tx_size_ctx][PLANE_TYPE_Y][1][0][coeff_ctx][0];
+#endif
   if (tx_size > TX_4X4) {
     int ctx = txfm_partition_context(
         xd->above_txfm_context, xd->left_txfm_context, mbmi->sb_type, tx_size);