commit 0d2d3321af58c8b2af18bbfec2e63bf6f8902a65
author Jingning Han <jingning@google.com> Fri Jan 02 11:50:57 2015 -0800
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Fri Jan 02 11:50:57 2015 -0800
tree 941e46fb9c2e8bb0ea47b5ced25938a1116a5853
parent 59cfaa538e4c4f036229445582083e2a47f6f911
parent 5486db185c261b87fb6b56ced43b7a050d11ab74

Merge "Add bsize check condition in nonrd_use_partition"

vp9/encoder/vp9_encodeframe.c

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 89486f0..6784d01 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -3227,7 +3227,7 @@
       pc_tree->vertical[0].skip = x->skip;
       encode_b_rt(cpi, td, tile_info, tp, mi_row, mi_col, output_enabled,
                   subsize, &pc_tree->vertical[0]);
-      if (mi_col + hbs < cm->mi_cols) {
+      if (mi_col + hbs < cm->mi_cols && bsize > BLOCK_8X8) {
         pc_tree->vertical[1].pred_pixel_ready = 1;
         nonrd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col + hbs,
                             dummy_cost, subsize, &pc_tree->vertical[1]);
@@ -3248,7 +3248,7 @@
       encode_b_rt(cpi, td, tile_info, tp, mi_row, mi_col, output_enabled,
                   subsize, &pc_tree->horizontal[0]);
 
-      if (mi_row + hbs < cm->mi_rows) {
+      if (mi_row + hbs < cm->mi_rows && bsize > BLOCK_8X8) {
         pc_tree->horizontal[1].pred_pixel_ready = 1;
         nonrd_pick_sb_modes(cpi, tile_data, x, mi_row + hbs, mi_col,
                             dummy_cost, subsize, &pc_tree->horizontal[1]);