From 5a4e17b42f8aee5c50a4169c56b810e3ed1bff1e Mon Sep 17 00:00:00 2001
From: Jingning Han <jingning@google.com>
Date: Wed, 23 Apr 2014 18:59:26 -0700
Subject: [PATCH] Apply max intra block size condition to non-RD mode decision
Change-Id: I9b86a94d11db2239c85f61aeed5bbd83a0dfa028
---
vp9/encoder/vp9_pickmode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index 699e70784c..3a9f0f5f12 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -418,7 +418,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
// 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,
--
GitLab