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

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 802cf37950738ef17720e3e62e1cdf6f245839b7..838f285945bb000db3f41790cd10ba4153e94774 100644 (file)
--- 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;