commit 46ff5522d76aed211f0492caf66bbcbd4c4ea961
author Urvang Joshi <urvang@google.com> Mon Mar 30 15:27:37 2020 -0700
committer Urvang Joshi <urvang@google.com> Tue Mar 31 15:38:52 2020 +0000
tree 2444e784b921bda8f8a26ca8d79cc7a47be9c4a0
parent 5c8625af9dd7293d8da6a38b3ce85135c756d155

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/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 4541008..0dc539f 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -341,7 +341,7 @@
   }
 
   set_plane_n4(xd, bw, bh, num_planes);
-  set_skip_context(xd, mi_row, mi_col, num_planes);
+  set_entropy_context(xd, mi_row, mi_col, num_planes);
 
   // Distance of Mb to the various image edges. These are specified to 8th pel
   // as they are always compared to values that are in 1/8th pel units
@@ -1465,7 +1465,7 @@
       }
     }
   }
-  if (mbmi->skip) av1_reset_skip_context(xd, bsize, num_planes);
+  if (mbmi->skip) av1_reset_entropy_context(xd, bsize, num_planes);
 
   decode_token_recon_block(pbi, td, r, bsize);
 }