Commit 0fe8304d authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

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

parents 87d1a488 e5fe1658
...@@ -715,6 +715,7 @@ static void choose_partitioning(VP9_COMP *cpi, ...@@ -715,6 +715,7 @@ static void choose_partitioning(VP9_COMP *cpi,
unsigned int var = 0, uv_sse; unsigned int var = 0, uv_sse;
#if GLOBAL_MOTION #if GLOBAL_MOTION
unsigned int y_sse; unsigned int y_sse;
BLOCK_SIZE bsize;
#endif #endif
vp9_setup_pre_planes(xd, 0, yv12, mi_row, mi_col, vp9_setup_pre_planes(xd, 0, yv12, mi_row, mi_col,
&cm->frame_refs[LAST_FRAME - 1].sf); &cm->frame_refs[LAST_FRAME - 1].sf);
...@@ -725,7 +726,16 @@ static void choose_partitioning(VP9_COMP *cpi, ...@@ -725,7 +726,16 @@ static void choose_partitioning(VP9_COMP *cpi,
mbmi->interp_filter = BILINEAR; mbmi->interp_filter = BILINEAR;
#if GLOBAL_MOTION #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 #endif
vp9_build_inter_predictors_sb(xd, mi_row, mi_col, BLOCK_64X64); vp9_build_inter_predictors_sb(xd, mi_row, mi_col, BLOCK_64X64);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment