shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Properly handle the boundary blocks for integral projection search"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -715,6 +715,7 @@

     unsigned int var = 0, uv_sse;

 #if GLOBAL_MOTION

     unsigned int y_sse;

+    BLOCK_SIZE bsize;

 #endif

     vp9_setup_pre_planes(xd, 0, yv12, mi_row, mi_col,

         &cm->frame_refs[LAST_FRAME - 1].sf);

@@ -725,7 +726,16 @@

     mbmi->interp_filter = BILINEAR;

 #if GLOBAL_MOTION

-    y_sse = motion_estimation(cpi, x, BLOCK_64X64);

+    if (mi_row + 4 < cm->mi_rows && mi_col + 4 < cm->mi_cols)

+      bsize = BLOCK_64X64;

+    else if (mi_row + 4 < cm->mi_rows && mi_col + 4 >= cm->mi_cols)

+      bsize = BLOCK_32X64;

+    else if (mi_row + 4 >= cm->mi_rows && mi_col + 4 < cm->mi_cols)

+      bsize = BLOCK_64X32;

+    else

+      bsize = BLOCK_32X32;

+

+    y_sse = motion_estimation(cpi, x, bsize);

 #endif

     vp9_build_inter_predictors_sb(xd, mi_row, mi_col, BLOCK_64X64);