commit 68570910c4104426198d34b7aa9c58ffeea11306
author Jingning Han <jingning@google.com> Mon Aug 05 10:58:31 2019 -0700
committer Jingning Han <jingning@google.com> Tue Aug 06 06:37:53 2019 +0000
tree 8e18a9b526b2eea7e78dbe2e78eb982afc3b280e
parent 9b11e6de037e3259b54d73f213ddec6ac6ccccc8

Remove deprecated token pointer

The lv-map coefficient coding system directly uses the quantized
coefficients for entropy coding. The token pointer is no longer
needed in the mode search.

Change-Id: I1f496ec3bb22db4f16ea4728866f29bd88bd787b

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 7a65029..8431f4b 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -2164,7 +2164,7 @@
   MACROBLOCK *const x = &td->mb;
   MACROBLOCKD *const xd = &x->e_mbd;
   MB_MODE_INFO *const mbmi = xd->mi[0];
-  struct tokenize_b_args arg = { cpi, td, NULL, 0, allow_update_cdf };
+  struct tokenize_b_args arg = { cpi, td, 0, allow_update_cdf };
   (void)rate;
   (void)mi_row;
   (void)mi_col;

av1/encoder/tokenize.c

diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index dc25ecd..8f508ec 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -195,7 +195,7 @@
   MACROBLOCKD *const xd = &x->e_mbd;
   MB_MODE_INFO *const mbmi = xd->mi[0];
   (void)t;
-  struct tokenize_b_args arg = { cpi, td, t, 0, allow_update_cdf };
+  struct tokenize_b_args arg = { cpi, td, 0, allow_update_cdf };
   if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols) return;
 
   assert(bsize < BLOCK_SIZES_ALL);

av1/encoder/tokenize.h

diff --git a/av1/encoder/tokenize.h b/av1/encoder/tokenize.h
index c80af7b..d078eeb 100644
--- a/av1/encoder/tokenize.h
+++ b/av1/encoder/tokenize.h
@@ -33,7 +33,6 @@
 struct tokenize_b_args {
   const struct AV1_COMP *cpi;
   struct ThreadData *td;
-  TOKENEXTRA **tp;
   int this_rate;
   uint8_t allow_update_cdf;
 };