From 215b010f4b3b1a530b4d9d774b87107ec0172a0b Mon Sep 17 00:00:00 2001 From: Yunqing Wang Date: Thu, 1 Aug 2013 11:37:41 -0700 Subject: Add more checking to using_small_partition_info If the partition is out of partition size range, we don't need to process small partition information. Change-Id: Ice9bfbbdebe1f2ef79271a3aee17de0ed4608376 --- vp9/encoder/vp9_encodeframe.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'vp9/encoder/vp9_encodeframe.c') diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index f6521740b..15dc64e03 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1555,13 +1555,16 @@ static void rd_pick_partition(VP9_COMP *cpi, TOKENEXTRA **tp, int mi_row, } } + // Use 4 subblocks' motion estimation results to speed up current + // partition's checking. x->fast_ms = 0; x->pred_mv.as_int = 0; x->subblock_ref = 0; - // Use 4 subblocks' motion estimation results to speed up current - // partition's checking. - if (cpi->sf.using_small_partition_info) { + if (cpi->sf.using_small_partition_info && + (!cpi->sf.auto_min_max_partition_size || + (bsize <= cpi->sf.max_partition_size && + bsize >= cpi->sf.min_partition_size))) { // Only use 8x8 result for non HD videos. // int use_8x8 = (MIN(cpi->common.width, cpi->common.height) < 720) ? 1 : 0; int use_8x8 = 1; -- cgit v1.2.3