From 84f3b76e1cd3d80e7f15e24dea79a85c86689bc6 Mon Sep 17 00:00:00 2001
From: Jingning Han <jingning@google.com>
Date: Thu, 22 Aug 2013 17:15:01 -0700
Subject: [PATCH] Fix rectangular partition check flag
Put rectangular partition check flag change according to the rd
costs of NONE and SPLIT partition types under the speed feature.
Change-Id: If681e1e078a8d43d86961ea4b748da5cd1b6c331
---
vp9/encoder/vp9_encodeframe.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 802cf37950..838f285945 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1790,8 +1790,8 @@ static void rd_pick_partition(VP9_COMP *cpi, TOKENEXTRA **tp, int mi_row,
} else {
// skip rectangular partition test when larger block size
// gives better rd cost
- do_rect &= !partition_none_allowed &&
- cpi->sf.less_rectangular_check;
+ if (cpi->sf.less_rectangular_check)
+ do_rect &= !partition_none_allowed;
}
}
partition_split_done = 1;
--
GitLab