Merge "vp9: speed 8: Compute y sad without int_pro_motion_estimation."

This commit is contained in:
Jerome Jiang 2017-04-06 02:57:16 +00:00 committed by Gerrit Code Review
commit c9fbb1881a

View File

@ -1141,7 +1141,13 @@ static int choose_partitioning(VP9_COMP *cpi, const TileInfo *const tile,
mi->mv[0].as_int = 0;
mi->interp_filter = BILINEAR;
y_sad = vp9_int_pro_motion_estimation(cpi, x, bsize, mi_row, mi_col);
if (cpi->oxcf.speed >= 8)
y_sad = cpi->fn_ptr[bsize].sdf(
x->plane[0].src.buf, x->plane[0].src.stride, xd->plane[0].pre[0].buf,
xd->plane[0].pre[0].stride);
else
y_sad = vp9_int_pro_motion_estimation(cpi, x, bsize, mi_row, mi_col);
y_sad_last = y_sad;
// Pick ref frame for partitioning, bias last frame when y_sad_g and y_sad
// are close if short_circuit_low_temp_var is on.