commit 4755dc135e33c41fdd5a4efa8c2470d75ee2a1b1
author Jingning Han <jingning@google.com> Thu Dec 03 16:06:29 2020 -0800
committer Jingning Han <jingning@google.com> Fri Dec 04 21:20:40 2020 +0000
tree 5f9c13dd8b045e469659a8c341f8399956cb26e5
parent d278552594de703387b0d7ab776eee016e1d26d4

Clean up input args in av1_estimate_txfm_yrd()

Remove unused input arguments.

Change-Id: I201700d7bdac571b0abb70163cc7df69de6e1bdd

av1/encoder/compound_type.c

diff --git a/av1/encoder/compound_type.c b/av1/encoder/compound_type.c
index 8adb6d5..b1a0c30 100644
--- a/av1/encoder/compound_type.c
+++ b/av1/encoder/compound_type.c
@@ -483,11 +483,8 @@
   MACROBLOCKD *const xd = &x->e_mbd;
   if (ref_best_rd < 0) return INT64_MAX;
   av1_subtract_plane(x, bs, 0);
-  const int skip_trellis = (cpi->optimize_seg_arr[xd->mi[0]->segment_id] ==
-                            NO_ESTIMATE_YRD_TRELLIS_OPT);
   const int64_t rd = av1_estimate_txfm_yrd(cpi, x, rd_stats, ref_best_rd, bs,
-                                           max_txsize_rect_lookup[bs],
-                                           FTXS_NONE, skip_trellis);
+                                           max_txsize_rect_lookup[bs]);
   if (rd != INT64_MAX) {
     const int skip_ctx = av1_get_skip_txfm_context(xd);
     if (rd_stats->skip_txfm) {

av1/encoder/tx_search.c

diff --git a/av1/encoder/tx_search.c b/av1/encoder/tx_search.c
index cd3ba1c..1428c1f 100644
--- a/av1/encoder/tx_search.c
+++ b/av1/encoder/tx_search.c
@@ -3202,8 +3202,7 @@
 
 int64_t av1_estimate_txfm_yrd(const AV1_COMP *const cpi, MACROBLOCK *x,
                               RD_STATS *rd_stats, int64_t ref_best_rd,
-                              BLOCK_SIZE bs, TX_SIZE tx_size,
-                              FAST_TX_SEARCH_MODE ftxs_mode, int skip_trellis) {
+                              BLOCK_SIZE bs, TX_SIZE tx_size) {
   MACROBLOCKD *const xd = &x->e_mbd;
   MB_MODE_INFO *const mbmi = xd->mi[0];
   const TxfmSearchParams *txfm_params = &x->txfm_search_params;
@@ -3237,8 +3236,6 @@
   args.cpi = cpi;
   args.best_rd = ref_best_rd;
   args.current_rd = AOMMIN(no_this_rd, skip_txfm_rd);
-  args.ftxs_mode = ftxs_mode;
-  args.skip_trellis = skip_trellis;
   av1_init_rd_stats(&args.rd_stats);
   av1_get_entropy_contexts(bs, &xd->plane[0], args.t_above, args.t_left);
   int i = 0;

av1/encoder/tx_search.h

diff --git a/av1/encoder/tx_search.h b/av1/encoder/tx_search.h
index 2fdecd5..e3caf5b 100644
--- a/av1/encoder/tx_search.h
+++ b/av1/encoder/tx_search.h
@@ -49,8 +49,7 @@
 
 int64_t av1_estimate_txfm_yrd(const AV1_COMP *const cpi, MACROBLOCK *x,
                               RD_STATS *rd_stats, int64_t ref_best_rd,
-                              BLOCK_SIZE bs, TX_SIZE tx_size,
-                              FAST_TX_SEARCH_MODE ftxs_mode, int skip_trellis);
+                              BLOCK_SIZE bs, TX_SIZE tx_size);
 
 /*!\brief Transform type search for luma macroblock with fixed transform size.
  *