commit 9cea993bfc75ad586633db3831982f634cb227d2
author Luc Trudeau <luc@trud.ca> Wed Dec 13 21:14:13 2017 -0500
committer Luc Trudeau <luc@trud.ca> Tue Dec 19 01:51:44 2017 +0000
tree ce221ace1f51e99c5c7854483f0657baf46818a6
parent 7197411d64a73317a69120841d3cdd054214483a

[CleanUp] Wrap intra_mode_to_tx_type_context

To avoid using a UV_PREDICTION_MODE with intra_mode_to_tx_type_context,
a wrapper function is added. Using a UV_PREDICTION_MODE with
intra_mode_to_tx_type_context is problematic with UV_CFL_PRED which
needs to be converted to DC_PRED.

Change-Id: I68320e34dd5e616d0f15ca2c1c951440243968cf

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 2adf331..7bf435d 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2465,7 +2465,8 @@
     }
   } else {
     if (!ALLOW_INTRA_EXT_TX && bs >= BLOCK_8X8) {
-      if (tx_type != intra_mode_to_tx_type_context[mbmi->mode]) return 1;
+      if (tx_type != intra_mode_to_tx_type_context(mbmi, PLANE_TYPE_Y))
+        return 1;
     }
   }
   return 0;
@@ -2497,7 +2498,6 @@
   int s1 = x->skip_cost[skip_ctx][1];
   const int is_inter = is_inter_block(mbmi);
   int prune = 0;
-  const int plane = 0;
   av1_invalid_rd_stats(rd_stats);
 
   mbmi->tx_size = tx_size_from_tx_mode(bs, cm->tx_mode, is_inter);
@@ -2529,17 +2529,18 @@
             tx_type != get_default_tx_type(0, xd, mbmi->tx_size))
           continue;
         if (!ALLOW_INTRA_EXT_TX && bs >= BLOCK_8X8) {
-          if (tx_type != intra_mode_to_tx_type_context[mbmi->mode]) continue;
+          if (tx_type != intra_mode_to_tx_type_context(mbmi, PLANE_TYPE_Y))
+            continue;
         }
       }
 
       mbmi->tx_type = tx_type;
 
-      txfm_rd_in_plane(x, cpi, &this_rd_stats, ref_best_rd, 0, bs,
+      txfm_rd_in_plane(x, cpi, &this_rd_stats, ref_best_rd, AOM_PLANE_Y, bs,
                        mbmi->tx_size, cpi->sf.use_fast_coef_costing);
 
       if (this_rd_stats.rate == INT_MAX) continue;
-      av1_tx_type_cost(cm, x, xd, bs, plane, mbmi->tx_size, tx_type);
+      av1_tx_type_cost(cm, x, xd, bs, AOM_PLANE_Y, mbmi->tx_size, tx_type);
 
       if (this_rd_stats.skip)
         this_rd = RDCOST(x->rdmult, s1, this_rd_stats.sse);
@@ -2559,8 +2560,8 @@
 
   } else {
     mbmi->tx_type = DCT_DCT;
-    txfm_rd_in_plane(x, cpi, rd_stats, ref_best_rd, 0, bs, mbmi->tx_size,
-                     cpi->sf.use_fast_coef_costing);
+    txfm_rd_in_plane(x, cpi, rd_stats, ref_best_rd, AOM_PLANE_Y, bs,
+                     mbmi->tx_size, cpi->sf.use_fast_coef_costing);
   }
   mbmi->tx_type = best_tx_type;
 }
@@ -4930,7 +4931,8 @@
           }
         } else {
           if (!ALLOW_INTRA_EXT_TX && bsize >= BLOCK_8X8) {
-            if (tx_type != intra_mode_to_tx_type_context[mbmi->mode]) continue;
+            if (tx_type != intra_mode_to_tx_type_context(mbmi, PLANE_TYPE_Y)
+       continue;
           }
         }
     */