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 01b5abb..ebce150 100644 --- a/vp10/encoder/rdopt.c +++ b/vp10/encoder/rdopt.c
@@ -603,17 +603,6 @@ 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 @@ 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 169ae2c..c50b949 100644 --- a/vp10/encoder/speed_features.c +++ b/vp10/encoder/speed_features.c
@@ -199,9 +199,6 @@ 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 02ee204..ea4df6e 100644 --- a/vp10/encoder/speed_features.h +++ b/vp10/encoder/speed_features.h
@@ -188,8 +188,6 @@ #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;