commit e50f3eca1ae73e42c858b2e53c7c0d3d95b4a5b8
author Angie Chiang <angiebird@google.com> Mon Apr 10 15:50:33 2017 -0700
committer Angie Chiang <angiebird@google.com> Tue Apr 11 23:56:30 2017 +0000
tree 1b2cfcb7f92c5fb34e74042fd14b5164f46e0dc6
parent ca7ec4b04fbefd231bea5a3b54bf91052a053a0c

Call av1_search_txk_type in block_rd_txfm

This is part of tx kernel selection feature.

Change-Id: I822e5a46d39c1fd525c911fc2a06e1be041d8ec8

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 2e5118b..f026d9b 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1549,7 +1549,7 @@
   MACROBLOCK *const x = args->x;
   MACROBLOCKD *const xd = &x->e_mbd;
   MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
-  const AV1_COMMON *cm = &args->cpi->common;
+  const AV1_COMP *cpi = args->cpi;
   int64_t rd1, rd2, rd;
   int coeff_ctx = combine_entropy_contexts(*(args->t_above + blk_col),
                                            *(args->t_left + blk_row));
@@ -1566,7 +1566,9 @@
     av1_subtract_txb(x, plane, plane_bsize, blk_col, blk_row, tx_size);
   }
 
+#if !CONFIG_LV_MAP
   // full forward transform and quantization
+  const AV1_COMMON *cm = &cpi->common;
   av1_xform_quant(cm, x, plane, block, blk_row, blk_col, plane_bsize, tx_size,
                   coeff_ctx, AV1_XFORM_QUANT_FP);
   if (x->plane[plane].eobs[block] && !xd->lossless[mbmi->segment_id])
@@ -1584,6 +1586,10 @@
                    tx_size, &this_rd_stats.dist, &this_rd_stats.sse,
                    OUTPUT_HAS_PREDICTED_PIXELS);
   }
+#else   // !CONFIG_LV_MAP
+  av1_search_txk_type(cpi, x, plane, block, blk_row, blk_col, plane_bsize,
+                      tx_size, coeff_ctx, &this_rd_stats);
+#endif  // !CONFIG_LV_MAP
 
   rd = RDCOST(x->rdmult, x->rddiv, 0, this_rd_stats.dist);
   if (args->this_rd + rd > args->best_rd) {