commit 388d92c758fb1fc81574bb1c537a01eb153ff157
author Angie Chiang <angiebird@google.com> Wed Aug 23 15:43:06 2017 -0700
committer Angie Chiang <angiebird@google.com> Tue Aug 29 00:38:23 2017 +0000
tree e26db6fcd88c9d593d4dacab1c85fddd04c5b92c
parent 3e36247dcaf001259f7ae883b200ccf2229f53e1

get_base_ctx_set calls get_base_ctx_from_count_mag

Change-Id: I598b2057dff1cdbdcc0f1464850f773b7ca5a7ac

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index b00abb5..432e9be 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -323,16 +323,7 @@
   }
 
   for (i = 0; i < NUM_BASE_LEVELS; ++i) {
-    ctx_set[i] = (ctx_set[i] + 1) >> 1;
-
-    if (row == 0 && col == 0)
-      ctx_set[i] = (ctx_set[i] << 1) + mag[i];
-    else if (row == 0)
-      ctx_set[i] = 8 + (ctx_set[i] << 1) + mag[i];
-    else if (col == 0)
-      ctx_set[i] = 18 + (ctx_set[i] << 1) + mag[i];
-    else
-      ctx_set[i] = 28 + (ctx_set[i] << 1) + mag[i];
+    ctx_set[i] = get_base_ctx_from_count_mag(row, col, ctx_set[i], mag[i]);
   }
   return;
 }