Commit 8297b4d7 authored by Yunqing Wang's avatar Yunqing Wang Committed by Gerrit Code Review
Browse files

Merge "Modify non-rd intra mode checking"

parents ea2bac9f 55834d42
...@@ -469,7 +469,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -469,7 +469,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
// Perform intra prediction search, if the best SAD is above a certain // Perform intra prediction search, if the best SAD is above a certain
// threshold. // threshold.
if (!x->skip && best_rd > inter_mode_thresh && if (!x->skip && best_rd > inter_mode_thresh &&
bsize < cpi->sf.max_intra_bsize) { bsize <= cpi->sf.max_intra_bsize) {
for (this_mode = DC_PRED; this_mode <= DC_PRED; ++this_mode) { for (this_mode = DC_PRED; this_mode <= DC_PRED; ++this_mode) {
vp9_predict_intra_block(xd, 0, b_width_log2(bsize), vp9_predict_intra_block(xd, 0, b_width_log2(bsize),
mbmi->tx_size, this_mode, mbmi->tx_size, this_mode,
......
...@@ -270,6 +270,10 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, ...@@ -270,6 +270,10 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
sf->source_var_thresh = 360; sf->source_var_thresh = 360;
sf->tx_size_search_method = USE_TX_8X8; sf->tx_size_search_method = USE_TX_8X8;
// TODO(yunqingwang): max_intra_bsize is used to decide if DC_PRED mode
// is checked for a partition block. Later, we can try to allow large
// partitions to do intra mode checking.
sf->max_intra_bsize = BLOCK_8X8;
} }
if (speed >= 7) { if (speed >= 7) {
......
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