commit 0c72b2fb676c359bf8dc018689e97aaa0e5f1ef9
author Linfeng Zhang <linfengz@google.com> Mon Dec 04 10:59:28 2017 -0800
committer James Zern <jzern@google.com> Thu Dec 07 20:48:14 2017 +0000
tree eedbb6882a19ccb6b06b12fa49ecca619dfdee29
parent 4d51bedc86dbd977a0b51beae072ea5f83de45c9

Clean txb code

Make a couple of functions inlined, and other small changes.

Change-Id: Icd11b20f0fa2ddb14621df401f95cf0ce2f6be28

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 599ba36..f968996 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -143,10 +143,9 @@
                             TX_TYPE tx_type, PLANE_TYPE plane,
                             FRAME_CONTEXT *ec_ctx, FRAME_COUNTS *counts,
                             uint8_t allow_update_cdf) {
-  int16_t eob_extra;
-  int16_t eob_pt = get_eob_pos_token(eob, &eob_extra);
-  int16_t dummy;
-  int16_t max_eob_pt = get_eob_pos_token(seg_eob, &dummy);
+  int eob_extra, dummy;
+  const int eob_pt = get_eob_pos_token(eob, &eob_extra);
+  const int max_eob_pt = get_eob_pos_token(seg_eob, &dummy);
   TX_SIZE txs_ctx = get_txsize_entropy_ctx(tx_size);
 
   for (int i = 1; i < max_eob_pt; i++) {
@@ -171,10 +170,9 @@
 
 static int get_eob_cost(int eob, int seg_eob,
                         const LV_MAP_COEFF_COST *txb_costs, TX_TYPE tx_type) {
-  int16_t eob_extra;
-  int16_t eob_pt = get_eob_pos_token(eob, &eob_extra);
-  int16_t dummy;
-  int16_t max_eob_pt = get_eob_pos_token(seg_eob, &dummy);
+  int eob_extra, dummy;
+  const int eob_pt = get_eob_pos_token(eob, &eob_extra);
+  const int max_eob_pt = get_eob_pos_token(seg_eob, &dummy);
   int eob_cost = 0;
 
   // printf("Enc: [%d, %d], (%d, %d) ", seg_eob, eob, eob_pt, eob_extra);
@@ -351,10 +349,9 @@
                     get_min_tx_size(tx_size), w);
 #endif
 
-  int16_t eob_extra;
-  int16_t eob_pt = get_eob_pos_token(eob, &eob_extra);
-  int16_t dummy;
-  int16_t max_eob_pt = get_eob_pos_token(seg_eob, &dummy);
+  int eob_extra, dummy;
+  const int eob_pt = get_eob_pos_token(eob, &eob_extra);
+  const int max_eob_pt = get_eob_pos_token(seg_eob, &dummy);
 
   // printf("Enc: [%d, %d], (%d, %d) ", seg_eob, eob, eob_pt, eob_extra);
   for (int i = 1; i < max_eob_pt; i++) {
@@ -865,8 +862,8 @@
     const int row = coeff_idx >> bwl;
     const int col = coeff_idx - (row << bwl);
 
-    txb_cache->nz_count_arr[coeff_idx] =
-        get_nz_count(levels, bwl, row, col, get_tx_class(txb_info->tx_type));
+    txb_cache->nz_count_arr[coeff_idx] = get_nz_count(
+        levels, bwl, row, col, tx_type_to_class[txb_info->tx_type]);
 
     txb_cache->nz_ctx_arr[coeff_idx] = get_nz_map_ctx_from_stats(
 #if USE_CAUSAL_BASE_CTX