commit ba939d931a61ab509a9f20f4c0e92592085b0e82
author elliottk <elliottk@google.com> Mon Jan 14 23:23:04 2019 -0800
committer Elliott Karpilovsky <elliottk@google.com> Wed Jan 16 19:06:25 2019 +0000
tree 79d7a55bf9cf541d41dc4998b48048612929aaf5
parent 0308a5a454eb2aaab06c9725896a153361be0fd8

Remove rd_mult_thresh_sub8x8

Not used anywhere.

Change-Id: I67c956923050ecef8ccf9b2f4fe56e748e5320d2

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 63e0d34..b9d1124 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -3949,7 +3949,6 @@
   cpi->global_motion_search_done = 0;
   av1_set_speed_features_framesize_independent(cpi);
   av1_set_rd_speed_thresholds(cpi);
-  av1_set_rd_speed_thresholds_sub8x8(cpi);
   cm->interp_filter = SWITCHABLE;
   cm->switchable_motion_mode = 1;
 

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index c030d91..05e5097 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -1495,15 +1495,6 @@
   rd->thresh_mult[THR_D45_PRED] += 2500;
 }
 
-void av1_set_rd_speed_thresholds_sub8x8(AV1_COMP *cpi) {
-  static const int thresh_mult[MAX_REFS] = { 2500, 2500, 2500, 2500, 2500,
-                                             2500, 2500, 4500, 4500, 4500,
-                                             4500, 4500, 4500, 4500, 4500,
-                                             4500, 4500, 4500, 4500, 2500 };
-  RD_OPT *const rd = &cpi->rd;
-  memcpy(rd->thresh_mult_sub8x8, thresh_mult, sizeof(thresh_mult));
-}
-
 void av1_update_rd_thresh_fact(const AV1_COMMON *const cm,
                                int (*factor_buf)[MAX_MODES], int rd_thresh,
                                int bsize, int best_mode_index) {

av1/encoder/rd.h

diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h
index f61c23d..b2360ee 100644
--- a/av1/encoder/rd.h
+++ b/av1/encoder/rd.h
@@ -283,7 +283,6 @@
   // is used in combination with the current block size, and thresh_freq_fact
   // to pick a threshold.
   int thresh_mult[MAX_MODES];
-  int thresh_mult_sub8x8[MAX_REFS];
 
   int threshes[MAX_SEGMENTS][BLOCK_SIZES_ALL][MAX_MODES];
 
@@ -684,8 +683,6 @@
 
 void av1_set_rd_speed_thresholds(struct AV1_COMP *cpi);
 
-void av1_set_rd_speed_thresholds_sub8x8(struct AV1_COMP *cpi);
-
 void av1_update_rd_thresh_fact(const AV1_COMMON *const cm,
                                int (*fact)[MAX_MODES], int rd_thresh, int bsize,
                                int best_mode_index);

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index a6ca533..f9de1a2 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -414,8 +414,6 @@
 void av1_set_speed_features_framesize_dependent(AV1_COMP *cpi) {
   SPEED_FEATURES *const sf = &cpi->sf;
   const AV1EncoderConfig *const oxcf = &cpi->oxcf;
-  RD_OPT *const rd = &cpi->rd;
-  int i;
 
   if (oxcf->mode == GOOD) {
     set_good_speed_feature_framesize_dependent(cpi, sf, oxcf->speed);
@@ -425,13 +423,6 @@
     sf->adaptive_pred_interp_filter = 0;
   }
 
-  // Check for masked out split cases.
-  for (i = 0; i < MAX_REFS; ++i) {
-    if (sf->disable_split_mask & (1 << i)) {
-      rd->thresh_mult_sub8x8[i] = INT_MAX;
-    }
-  }
-
   // This is only used in motion vector unit test.
   if (cpi->oxcf.motion_vector_unit_test == 1)
     cpi->find_fractional_mv_step = av1_return_max_sub_pixel_mv;