commit a6923f7f977f9e6a87cf66f2ab5354600c235f5b
author Jingning Han <jingning@google.com> Fri Jul 15 08:50:14 2016 -0700
committer Yaowu Xu <yaowu@google.com> Fri Oct 21 09:32:28 2016 -0700
tree 39075583cdb339a8416547704ffd0c8b84be74a1
parent 045d413ca25e4679c9597c0f4099eed448e058cb

Unify set_contexts() function for encoder and decoder

Remove the separate implementations of set_contexts() in encoder
and decoder.

Change-Id: I9f6e9b075532faae0f74f885d9443589254258a7

av1/encoder/tokenize.c

diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index fd0f76b..13abe6b 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -369,8 +369,8 @@
   int rate = av1_cost_coeffs(cm, x, plane, block, pt, tx_size, scan_order->scan,
                              scan_order->neighbors, 0);
   args->this_rate += rate;
-  av1_set_contexts(xd, pd, plane_bsize, tx_size, p->eobs[block] > 0, blk_col,
-                   blk_row);
+  (void)plane_bsize;
+  av1_set_contexts(xd, pd, tx_size, p->eobs[block] > 0, blk_col, blk_row);
 }
 
 static void set_entropy_context_b(int plane, int block, int blk_row,
@@ -382,8 +382,8 @@
   MACROBLOCKD *const xd = &x->e_mbd;
   struct macroblock_plane *p = &x->plane[plane];
   struct macroblockd_plane *pd = &xd->plane[plane];
-  av1_set_contexts(xd, pd, plane_bsize, tx_size, p->eobs[block] > 0, blk_col,
-                   blk_row);
+  (void)plane_bsize;
+  av1_set_contexts(xd, pd, tx_size, p->eobs[block] > 0, blk_col, blk_row);
 }
 
 static INLINE void add_token(TOKENEXTRA **t, const aom_prob *context_tree,
@@ -501,6 +501,7 @@
   int skip_eob = 0;
   int16_t token;
   EXTRABIT extra;
+  (void)plane_bsize;
   pt = get_entropy_context(tx_size, pd->above_context + blk_col,
                            pd->left_context + blk_row);
   scan = scan_order->scan;
@@ -535,7 +536,7 @@
 
   *tp = t;
 
-  av1_set_contexts(xd, pd, plane_bsize, tx_size, c > 0, blk_col, blk_row);
+  av1_set_contexts(xd, pd, tx_size, c > 0, blk_col, blk_row);
 }
 
 struct is_skippable_args {