ref: 7e6d851675869339dd26be8513f525bfe66b7ea9
parent: 03e7deae4f1a6323468983b0be1abc205a609bca
parent: 5a4e17b42f8aee5c50a4169c56b810e3ed1bff1e
author: Jingning Han <jingning@google.com>
date: Thu Apr 24 13:27:14 EDT 2014
Merge "Apply max intra block size condition to non-RD mode decision"
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -418,7 +418,7 @@
// Perform intra prediction search, if the best SAD is above a certain
// threshold.
- if (best_rd > inter_mode_thresh) {
+ if (best_rd > inter_mode_thresh && bsize < cpi->sf.max_intra_bsize) {
for (this_mode = DC_PRED; this_mode <= DC_PRED; ++this_mode) {
vp9_predict_intra_block(xd, 0, b_width_log2(bsize),
mbmi->tx_size, this_mode,