Rename contexts in MACROBLOCKD, MACROBLOCKD_PLANE

Match them with new names in CommonContexts (part of AV1_COMMON), to
ensure they explicitly name the type of context they are referring to.

Rename the relevant function too for clarity.

BUG=aomedia:2610

Change-Id: I9de0d0dcd61bea5fe3916a1ae7763ea9d26675f4

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 046d66e..fc5a851 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -2092,8 +2092,9 @@
   if (args->dry_run == OUTPUT_ENABLED) {
     MB_MODE_INFO *mbmi = xd->mi[0];
     TXB_CTX txb_ctx;
-    get_txb_ctx(plane_bsize, tx_size, plane, pd->above_context + blk_col,
-                pd->left_context + blk_row, &txb_ctx);
+    get_txb_ctx(plane_bsize, tx_size, plane,
+                pd->above_entropy_context + blk_col,
+                pd->left_entropy_context + blk_row, &txb_ctx);
     const int bwl = get_txb_bwl(tx_size);
     const int width = get_txb_wide(tx_size);
     const int height = get_txb_high(tx_size);
@@ -2118,8 +2119,8 @@
     eob_txb[block] = eob;
 
     if (eob == 0) {
-      av1_set_contexts(xd, pd, plane, plane_bsize, tx_size, 0, blk_col,
-                       blk_row);
+      av1_set_entropy_contexts(xd, pd, plane, plane_bsize, tx_size, 0, blk_col,
+                               blk_row);
       return;
     }
     const int segment_id = mbmi->segment_id;
@@ -2220,8 +2221,8 @@
     tcoeff = qcoeff;
   }
   const int cul_level = av1_get_txb_entropy_context(tcoeff, scan_order, eob);
-  av1_set_contexts(xd, pd, plane, plane_bsize, tx_size, cul_level, blk_col,
-                   blk_row);
+  av1_set_entropy_contexts(xd, pd, plane, plane_bsize, tx_size, cul_level,
+                           blk_col, blk_row);
 }
 
 void av1_update_txb_context(const AV1_COMP *cpi, ThreadData *td,
@@ -2234,7 +2235,7 @@
   MB_MODE_INFO *const mbmi = xd->mi[0];
   struct tokenize_b_args arg = { cpi, td, 0, allow_update_cdf, dry_run };
   if (mbmi->skip) {
-    av1_reset_skip_context(xd, bsize, num_planes);
+    av1_reset_entropy_context(xd, bsize, num_planes);
     return;
   }