Commit fab5454a authored by Sarah Parker's avatar Sarah Parker
Browse files

Remove prune three from speed features

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

Change-Id: Id12396786cb9369ad34d0bd845f7beba3a037726
parent cb61bfa6
...@@ -603,17 +603,6 @@ static int prune_two_for_sby(const VP10_COMP *cpi, ...@@ -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); 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 #endif // CONFIG_EXT_TX
// Performance drop: 0.3%, Speed improvement: 5% // Performance drop: 0.3%, Speed improvement: 5%
...@@ -644,9 +633,6 @@ static int prune_tx_types(const VP10_COMP *cpi, ...@@ -644,9 +633,6 @@ static int prune_tx_types(const VP10_COMP *cpi,
case PRUNE_TWO : case PRUNE_TWO :
return prune_two_for_sby(cpi, bsize, x, xd); return prune_two_for_sby(cpi, bsize, x, xd);
break; break;
case PRUNE_THREE :
return prune_three_for_sby(cpi, bsize, x, xd);
break;
#endif #endif
} }
assert(0); assert(0);
......
...@@ -199,9 +199,6 @@ static void set_good_speed_feature(VP10_COMP *cpi, VP10_COMMON *cm, ...@@ -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_y_mode_mask[TX_32X32] = INTRA_DC;
sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC; sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC;
sf->adaptive_interp_filter_search = 1; sf->adaptive_interp_filter_search = 1;
#if CONFIG_EXT_TX
sf->tx_type_search = PRUNE_THREE;
#endif
} }
if (speed >= 4) { if (speed >= 4) {
......
...@@ -188,8 +188,6 @@ typedef enum { ...@@ -188,8 +188,6 @@ typedef enum {
#if CONFIG_EXT_TX #if CONFIG_EXT_TX
// eliminates two tx types in each direction // eliminates two tx types in each direction
PRUNE_TWO = 2, PRUNE_TWO = 2,
// eliminates three tx types in each direction
PRUNE_THREE = 3,
#endif #endif
} TX_TYPE_SEARCH; } TX_TYPE_SEARCH;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment