Remove prune three from speed features

Not getting good results for this feature, will try again
when transforms are frozen.

Change-Id: Id12396786cb9369ad34d0bd845f7beba3a037726

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 01b5abb95bfdc0f44952481562eb0a90a56ad4e1..ebce1503e10780cb0bf6758689212f713a1b9e98 100644 (file)
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -603,17 +603,6 @@ static int prune_two_for_sby(const VP10_COMP *cpi,
          dct_vs_dst(p->src_diff, bw, bw, bh, &hcorr, &vcorr);
 }
 
-static int prune_three_for_sby(const VP10_COMP *cpi,
-                               BLOCK_SIZE bsize,
-                               MACROBLOCK *x,
-                               MACROBLOCKD *xd) {
-  (void) cpi;
-  (void) bsize;
-  (void) x;
-  (void) xd;
-  return 0;
-}
-
 #endif  // CONFIG_EXT_TX
 
 // Performance drop: 0.3%, Speed improvement: 5%
@@ -644,9 +633,6 @@ static int prune_tx_types(const VP10_COMP *cpi,
     case PRUNE_TWO :
       return prune_two_for_sby(cpi, bsize, x, xd);
       break;
-    case PRUNE_THREE :
-      return prune_three_for_sby(cpi, bsize, x, xd);
-      break;
   #endif
   }
   assert(0);

diff --git a/vp10/encoder/speed_features.c b/vp10/encoder/speed_features.c
index 169ae2cfc47e0f3d097f289d8c9b8e2045e05c35..c50b94926b6e40564e076b30d514c7ecbcbebae8 100644 (file)
--- a/vp10/encoder/speed_features.c
+++ b/vp10/encoder/speed_features.c
@@ -199,9 +199,6 @@ static void set_good_speed_feature(VP10_COMP *cpi, VP10_COMMON *cm,
     sf->intra_y_mode_mask[TX_32X32] = INTRA_DC;
     sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC;
     sf->adaptive_interp_filter_search = 1;
-#if CONFIG_EXT_TX
-    sf->tx_type_search = PRUNE_THREE;
-#endif
   }
 
   if (speed >= 4) {

diff --git a/vp10/encoder/speed_features.h b/vp10/encoder/speed_features.h
index 02ee204a97b9cc76a4464ec8ef8636d8e510e6be..ea4df6e94dbb37f48cd8c92eff13c25b7937d42e 100644 (file)
--- a/vp10/encoder/speed_features.h
+++ b/vp10/encoder/speed_features.h
@@ -188,8 +188,6 @@ typedef enum {
 #if CONFIG_EXT_TX
   // eliminates two tx types in each direction
   PRUNE_TWO = 2,
-  // eliminates three tx types in each direction
-  PRUNE_THREE = 3,
 #endif
 } TX_TYPE_SEARCH;