commit 102ef812d03e359a45793a61a7d4142279c638e8
author Yaowu Xu <yaowu@google.com> Tue Dec 12 11:31:03 2017 -0800
committer Yaowu Xu <yaowu@google.com> Wed Dec 13 00:01:27 2017 +0000
tree e6b80347e868631e7168c4063d247c5b8ca2ac9e
parent 2d46afcd22fd99d778b740b18041c0e563a42647

Change to pass in correct type of parameter

get_nz_map_ctx_from_stats() is take TX_CLASS instead of TX_TYPE, this
commit makes sure right type of parameter is passed in.

Change-Id: I09b97a31890050189fc12f0133c0bde83fc79615

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 2576333..c5a4a38 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -774,8 +774,9 @@
         get_nz_count(levels + get_padded_idx(coeff_idx, bwl), bwl,
                      tx_type_to_class[txb_info->tx_type]);
 
-    txb_cache->nz_ctx_arr[coeff_idx] = get_nz_map_ctx_from_stats(
-        0, coeff_idx, bwl, txb_info->tx_size, txb_info->tx_type);
+    txb_cache->nz_ctx_arr[coeff_idx] =
+        get_nz_map_ctx_from_stats(0, coeff_idx, bwl, txb_info->tx_size,
+                                  tx_type_to_class[txb_info->tx_type]);
 
     // gen_base_count_mag_arr
     if (!has_base(qcoeff[coeff_idx], 0)) continue;
@@ -992,7 +993,8 @@
     assert(count > 0);
     update_qcoeff(nb_coeff_idx, get_lower_coeff(nb_coeff), txb_info);
     const int new_ctx = get_nz_map_ctx_from_stats(
-        0, coeff_idx, txb_info->bwl, txb_info->tx_size, txb_info->tx_type);
+        0, coeff_idx, txb_info->bwl, txb_info->tx_size,
+        tx_type_to_class[txb_info->tx_type]);
     update_qcoeff(nb_coeff_idx, nb_coeff, txb_info);
     const int ctx = txb_cache->nz_ctx_arr[coeff_idx];
 #if CONFIG_LV_MAP_MULTI
@@ -1382,9 +1384,9 @@
           txb_cache->nz_count_arr[nb_coeff_idx] -= 1;
           assert(txb_cache->nz_count_arr[nb_coeff_idx] >= 0);
         }
-        txb_cache->nz_ctx_arr[nb_coeff_idx] =
-            get_nz_map_ctx_from_stats(0, nb_coeff_idx, txb_info->bwl,
-                                      txb_info->tx_size, txb_info->tx_type);
+        txb_cache->nz_ctx_arr[nb_coeff_idx] = get_nz_map_ctx_from_stats(
+            0, nb_coeff_idx, txb_info->bwl, txb_info->tx_size,
+            tx_type_to_class[txb_info->tx_type]);
       }
     }
   }