commit b3eda2f42f96e5db95738a4684e90e83d507939f
author Debargha Mukherjee <debargha@google.com> Tue Nov 28 16:00:20 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Thu Nov 30 01:06:30 2017 +0000
tree 61e5e324064965b9dd0ad66b2e1df6648fab7f15
parent f0049ba54564be86c647c6a628a8b470837c8fd7

Refactor/Change the entropy context for transforms

The change makes the entropy context for transforms use
the same mechanism as with and without lv_map.
For the non-lv-map case the context is now based on the
the larger transform dim for 2:1 rect transforms. The context
is now the average for 4:1 rect transforms for both lv-map and
non-lv-map cases.
There is one small fix for level map for getting the correct
rate when skip is set.

BDRATE: lowres, 30 frames, speed 1: -0.15% gain for the
non-lv-map case on the baseline.

Change-Id: I06a583d33bef68202d72a88e077f8d31cc5e7fe4

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 405e8af..bcf1dd9 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1620,7 +1620,7 @@
   const uint16_t *band_count = &band_count_table[tx_size][1];
   const int eob = p->eobs[block];
   const tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block);
-  const TX_SIZE tx_size_ctx = txsize_sqr_map[tx_size];
+  const TX_SIZE tx_size_ctx = get_txsize_entropy_ctx(tx_size);
   uint8_t token_cache[MAX_TX_SQUARE];
   int pt = combine_entropy_contexts(*a, *l);
   int c, cost;
@@ -3852,14 +3852,14 @@
   if (blk_row >= max_blocks_high || blk_col >= max_blocks_wide) return;
 
 #if CONFIG_LV_MAP
-  TX_SIZE txs_ctx = get_txsize_context(tx_size);
+  TX_SIZE txs_ctx = get_txsize_entropy_ctx(tx_size);
   TXB_CTX txb_ctx;
   get_txb_ctx(plane_bsize, tx_size, plane, pta, ptl, &txb_ctx);
 
   zero_blk_rate = x->coeff_costs[txs_ctx][get_plane_type(plane)]
                       .txb_skip_cost[txb_ctx.txb_skip_ctx][1];
 #else
-  TX_SIZE tx_size_ctx = txsize_sqr_map[tx_size];
+  TX_SIZE tx_size_ctx = get_txsize_entropy_ctx(tx_size);
   int coeff_ctx = get_entropy_context(tx_size, pta, ptl);
   zero_blk_rate =
       x->token_head_costs[tx_size_ctx][pd->plane_type][1][0][coeff_ctx][0];
@@ -4291,7 +4291,7 @@
     ENTROPY_CONTEXT *ta = above_ctx + blk_col;
     ENTROPY_CONTEXT *tl = left_ctx + blk_row;
 #if CONFIG_LV_MAP
-    const TX_SIZE txs_ctx = get_txsize_context(tx_size);
+    const TX_SIZE txs_ctx = get_txsize_entropy_ctx(tx_size);
     TXB_CTX txb_ctx;
     get_txb_ctx(plane_bsize, tx_size, plane, ta, tl, &txb_ctx);
 
@@ -4299,7 +4299,7 @@
                                   .txb_skip_cost[txb_ctx.txb_skip_ctx][1];
 #else
     const int coeff_ctx = get_entropy_context(tx_size, ta, tl);
-    const TX_SIZE tx_size_ctx = txsize_sqr_map[tx_size];
+    const TX_SIZE tx_size_ctx = get_txsize_entropy_ctx(tx_size);
     const int zero_blk_rate =
         x->token_head_costs[tx_size_ctx][pd->plane_type][1][0][coeff_ctx][0];
 #endif  // CONFIG_LV_MAP
@@ -4720,7 +4720,7 @@
   (void)cpi;
 
   // Rate.
-  const int tx_size_ctx = txsize_sqr_map[tx_size];
+  const int tx_size_ctx = get_txsize_entropy_ctx(tx_size);
   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);