Commit 0adb805d authored by Sarah Parker's avatar Sarah Parker Committed by Gerrit Code Review
Browse files

Merge "Remove prune three from speed features" into nextgenv2

parents 42e5c2ad fab5454a
......@@ -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);
......
......@@ -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) {
......
......@@ -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;
......
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