commit ab8840ebe95f0b2b85343bb821b539c58a3499b0
author Urvang Joshi <urvang@google.com> Fri Oct 06 16:38:24 2017 -0700
committer Urvang Joshi <urvang@google.com> Mon Oct 09 11:51:22 2017 -0700
tree c016badea5e031843b96d49b283e7df6b28a25e4
parent 1ea7ab4e698166403ba3293825b575977483ea94

Revert wrong uses of TX_SIZE enum.

Introduced by: https://aomedia-review.googlesource.com/c/aom/+/25181

Change-Id: I1f25178d6b273fbeade4c33f153b5f2bac4a8b99

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 5deb3fc..e02933b 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2212,20 +2212,19 @@
 }
 #endif  // CONFIG_SUPERTX
 
-static TX_SIZE tx_size_cost(const AV1_COMP *const cpi,
-                            const MACROBLOCK *const x, BLOCK_SIZE bsize,
-                            TX_SIZE tx_size) {
+static int tx_size_cost(const AV1_COMP *const cpi, const MACROBLOCK *const x,
+                        BLOCK_SIZE bsize, TX_SIZE tx_size) {
   const AV1_COMMON *const cm = &cpi->common;
   const MACROBLOCKD *const xd = &x->e_mbd;
   const MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
 
   if (cm->tx_mode == TX_MODE_SELECT && block_signals_txsize(mbmi->sb_type)) {
     const int is_inter = is_inter_block(mbmi);
-    const TX_SIZE tx_size_cat = is_inter ? inter_tx_size_cat_lookup[bsize]
+    const int32_t tx_size_cat = is_inter ? inter_tx_size_cat_lookup[bsize]
                                          : intra_tx_size_cat_lookup[bsize];
     const TX_SIZE coded_tx_size = txsize_sqr_up_map[tx_size];
     const int depth = tx_size_to_depth(coded_tx_size);
-    const TX_SIZE tx_size_ctx = get_tx_size_context(xd);
+    const int tx_size_ctx = get_tx_size_context(xd);
     int r_tx_size = x->tx_size_cost[tx_size_cat][tx_size_ctx][depth];
 #if CONFIG_RECT_TX_EXT && (CONFIG_EXT_TX || CONFIG_VAR_TX)
     if (is_quarter_tx_allowed(xd, mbmi, is_inter) && tx_size != coded_tx_size)