commit a22856968d6328274ece3d0d77baf2079904ab5e
author Jingning Han <jingning@google.com> Wed Oct 25 15:14:31 2017 -0700
committer Jingning Han <jingning@google.com> Thu Oct 26 18:18:57 2017 +0000
tree 86190033da3511a6e93977c49508b9a706ee2746
parent 9c168370558d10831679fa5b07b48cca2a584915

Clean up pack_txb_token interface

Change-Id: Idb805e3be693ff9d945998dea99c22fa6284bc04

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index da53814..a6fdff9 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -666,16 +666,10 @@
 
 #if !CONFIG_COEF_INTERLEAVE
 #if CONFIG_LV_MAP
-static void pack_txb_tokens(aom_writer *w,
-#if CONFIG_LV_MAP
-                            AV1_COMMON *cm,
-#endif  // CONFIG_LV_MAP
+static void pack_txb_tokens(aom_writer *w, AV1_COMMON *cm, MACROBLOCK *const x,
                             const TOKENEXTRA **tp,
-                            const TOKENEXTRA *const tok_end,
-#if CONFIG_LV_MAP
-                            MACROBLOCK *const x,
-#endif
-                            MACROBLOCKD *xd, MB_MODE_INFO *mbmi, int plane,
+                            const TOKENEXTRA *const tok_end, MACROBLOCKD *xd,
+                            MB_MODE_INFO *mbmi, int plane,
                             BLOCK_SIZE plane_bsize, aom_bit_depth_t bit_depth,
                             int block, int blk_row, int blk_col,
                             TX_SIZE tx_size, TOKEN_STATS *token_stats) {
@@ -721,16 +715,8 @@
 
       if (offsetr >= max_blocks_high || offsetc >= max_blocks_wide) continue;
 
-      pack_txb_tokens(w,
-#if CONFIG_LV_MAP
-                      cm,
-#endif
-                      tp, tok_end,
-#if CONFIG_LV_MAP
-                      x,
-#endif
-                      xd, mbmi, plane, plane_bsize, bit_depth, block, offsetr,
-                      offsetc, sub_txs, token_stats);
+      pack_txb_tokens(w, cm, x, tp, tok_end, xd, mbmi, plane, plane_bsize,
+                      bit_depth, block, offsetr, offsetc, sub_txs, token_stats);
       block += step;
     }
   }
@@ -2286,15 +2272,11 @@
               for (blk_col = col; blk_col < unit_width; blk_col += bkw) {
                 pack_txb_tokens(w,
 #if CONFIG_LV_MAP
-                                cm,
+                                cm, x,
 #endif
-                                tok, tok_end,
-#if CONFIG_LV_MAP
-                                x,
-#endif
-                                xd, mbmi, plane, plane_bsize, cm->bit_depth,
-                                block, blk_row, blk_col, max_tx_size,
-                                &token_stats);
+                                tok, tok_end, xd, mbmi, plane, plane_bsize,
+                                cm->bit_depth, block, blk_row, blk_col,
+                                max_tx_size, &token_stats);
                 block += step;
               }
             }