commit 155b9416b36d9708b18f22ef2bc396fba264f513
author Marco <marpan@chromium.org> Tue Jul 07 22:47:43 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 07 22:47:47 2015 +0000
tree 3a06fb9e2123e765c6600aefda102a09be3ff419
parent c2d0f9ddebf0e444692e1edb0302a8e6b4da41fe
parent 478fbc8f236ee4118e032074eb7c0a1be11d0d10

Merge "Update to speed 5 non-rd mode partition search."

vp9/encoder/vp9_encodeframe.c

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index b39b53d..02d986e 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -3349,8 +3349,13 @@
   subsize = (bsize >= BLOCK_8X8) ? mi[0]->mbmi.sb_type : BLOCK_4X4;
   partition = partition_lookup[bsl][subsize];
 
-  if (bsize == BLOCK_32X32 && partition != PARTITION_NONE &&
-      subsize >= BLOCK_16X16) {
+  if (bsize == BLOCK_32X32 && subsize == BLOCK_32X32) {
+    x->max_partition_size = BLOCK_32X32;
+    x->min_partition_size = BLOCK_16X16;
+    nonrd_pick_partition(cpi, td, tile_data, tp, mi_row, mi_col, bsize,
+                         rd_cost, 0, INT64_MAX, pc_tree);
+  } else if (bsize == BLOCK_32X32 && partition != PARTITION_NONE &&
+             subsize >= BLOCK_16X16) {
     x->max_partition_size = BLOCK_32X32;
     x->min_partition_size = BLOCK_8X8;
     nonrd_pick_partition(cpi, td, tile_data, tp, mi_row, mi_col, bsize,